Merge pull request #2350 from TDT-AG/pr/20181204-luci-mod-system

[oweals/luci.git] / modules / luci-base / po / ja / base.po

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index ba32d743d1d7440d8d41bb84561663f47bd3d947..efeffddf7f46856ad2947c02f9df7ed0898c5869 100644 (file)
--- 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-11-16 23:07+0900\n"
+"PO-Revision-Date: 2018-11-22 16:24+0900\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja\n"
@@ -13,12 +13,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:192
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
 msgid "%.1f dB"
 msgstr "%.1f dB"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:118
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
 msgid "%d Bit"
+msgstr "%d ビット"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:307
+msgid "%d invalid field(s)"
 msgstr ""
 
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:256
@@ -53,16 +57,16 @@ msgstr "(インターフェースが接続されていません)"
 msgid "-- Additional Field --"
 msgstr "-- 追加項目 --"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:842
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:851
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:841
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:850
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
 #: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:36
 msgid "-- Please choose --"
 msgstr "-- 選択してください --"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:867
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:1027
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:866
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:1030
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 手動設定 --"
@@ -94,7 +98,7 @@ msgstr "過去1分の負荷:"
 msgid "15 Minute Load:"
 msgstr "過去15分の負荷:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:879
 msgid "4-character hexadecimal ID"
 msgstr ""
 
@@ -106,35 +110,35 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "過去5分の負荷:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:887
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:915
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:824
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:850
 msgid "802.11r Fast Transition"
 msgstr "802.11r 高速ローミング"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1078
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1106
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w アソシエーションSAクエリの最大タイムアウト時間です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1087
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1115
 msgid "802.11w Association SA Query retry timeout"
 msgstr "802.11w アソシエーションSAクエリの再試行タイムアウト時間です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1060
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1088
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w 管理フレーム保護"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1077
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1105
 msgid "802.11w maximum timeout"
 msgstr "802.11w 最大タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1086
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1114
 msgid "802.11w retry timeout"
 msgstr "802.11w 再試行タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:390
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -154,7 +158,7 @@ msgstr ""
 "リゾルバファイルの順番に、<abbr title=\"Domain Name System\">DNS</abbr>サー"
 "バーに問い合わせを行います"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:377
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:379
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -238,21 +242,21 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/xhr.js:39
 msgid "A new login is required since the authentication session expired."
-msgstr ""
+msgstr "認証セッションの期限切れのため、再ログインが必要です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:173
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:174
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:162
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
@@ -266,37 +270,37 @@ msgstr "APN"
 msgid "ARP retry threshold"
 msgstr "ARP再試行しきい値"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:203
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
 msgid "ATM Bridges"
 msgstr "ATMブリッジ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:237
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM仮想チャネル識別子 (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:238
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM仮想パス識別子 (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:204
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:243
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
 msgid "ATM device number"
 msgstr "ATMデバイス番号"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:273
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:117
 msgid "ATU-C System Vendor ID"
 msgstr ""
 
@@ -304,8 +308,8 @@ msgstr ""
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:365
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:458
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:367
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
 msgid "Access Point"
 msgstr "アクセスポイント"
 
@@ -325,7 +329,7 @@ msgstr ""
 "稼働中の <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-経路情報"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:315
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:425
+#: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:15
 msgid "Active Connections"
 msgstr "アクティブ コネクション"
 
@@ -337,35 +341,43 @@ msgstr "アクティブなDHCPリース"
 msgid "Active DHCPv6 Leases"
 msgstr "アクティブなDHCPv6リース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:367
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: modules/luci-base/luasrc/view/cbi/nsection.htm:26
+#: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
-#: modules/luci-base/luasrc/view/cbi/tsection.htm:36
-#: modules/luci-base/luasrc/view/cbi/tsection.htm:44
+#: modules/luci-base/luasrc/view/cbi/tsection.htm:34
+#: modules/luci-base/luasrc/view/cbi/tsection.htm:42
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:83
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
 msgid "Add"
 msgstr "追加"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:129
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:152
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:158
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:239
-msgid "Add key"
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+msgid "Add IPv4 address…"
 msgstr ""
 
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+msgid "Add IPv6 address…"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
+#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+msgid "Add key"
+msgstr "公開鍵を追加"
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:109
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "hosts ファイルにより解決される名前にローカルドメイン サフィックスを付加しま"
 "す。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:67
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
 msgid "Add new interface..."
 msgstr "インターフェースの新規作成..."
 
@@ -377,8 +389,8 @@ msgstr "追加のホストファイル"
 msgid "Additional servers file"
 msgstr "追加のサーバー ファイル"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:206
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:233
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:79
 msgid "Address"
 msgstr "アドレス"
 
@@ -394,15 +406,15 @@ msgstr "管理画面"
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:22
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:235
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:264
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:108
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
@@ -411,11 +423,11 @@ msgid "Alert"
 msgstr "警告"
 
 #: modules/luci-base/luasrc/model/network.lua:1406
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "エイリアス インターフェース"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "\"%s\" のエイリアス"
 
@@ -437,21 +449,21 @@ msgstr ""
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:533
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:535
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr "AP モード動作時に、低 ACK（確認応答）状態の STA の切断を許可します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:450
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
 msgid "Allow all except listed"
 msgstr "リスト内の端末からのアクセスを禁止"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:235
 msgid "Allow legacy 802.11b rates"
 msgstr "レガシー 802.11b レートを許可"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:449
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:578
 msgid "Allow listed only"
 msgstr "リスト内の端末からのアクセスを許可"
 
@@ -485,7 +497,7 @@ msgstr "許可されるIP"
 msgid "Always announce default router"
 msgstr "常にデフォルト ルーターを通知する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -493,64 +505,64 @@ msgstr ""
 "セカンダリ チャンネルの重複にかかわらず、常に 40MHz チャンネルを使用します。"
 "このオプションの使用は、 IEEE 802.11n-2009 に準拠しません！"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:154
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:256
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:100
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:155
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:163
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:164
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:165
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:166
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:156
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:159
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:160
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:161
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:157
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:167
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:158
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:168
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:169
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
 msgid "Annex M G.992.5"
 msgstr ""
 
@@ -568,7 +580,7 @@ msgstr ""
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1020
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1048
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -580,17 +592,17 @@ msgstr "アノニマス マウント"
 msgid "Anonymous Swap"
 msgstr "アノニマス スワップ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:319
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:326
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
 msgid "Antenna 1"
 msgstr "アンテナ 1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:320
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:327
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
 msgid "Antenna 2"
 msgstr "アンテナ 2"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:243
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:245
 msgid "Antenna Configuration"
 msgstr "アンテナ設定"
 
@@ -606,32 +618,32 @@ msgstr "チェックなしの適用"
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "適用リクエストはステータス <code>%h</code> により失敗しました"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:384
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:19
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:42
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:171
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:126
 msgid "Assign interfaces..."
 msgstr "インターフェースの割当て..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:48
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:218
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:455
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "アソシエーション済み端末"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:316
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:159
 msgid "Associations"
 msgstr "アソシエーション数"
 
@@ -640,7 +652,7 @@ msgstr "アソシエーション数"
 msgid "Auth Group"
 msgstr "認証グループ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:954
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:982
 msgid "Authentication"
 msgstr "認証"
 
@@ -659,8 +671,8 @@ msgstr "ログイン認証"
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:185
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:131
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:224
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:225
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:223
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:246
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:249
@@ -720,11 +732,11 @@ msgstr "使用可"
 msgid "Average:"
 msgstr "平均値:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
 msgid "B43 + B43C + V43"
 msgstr ""
 
@@ -732,10 +744,10 @@ msgstr ""
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:199
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:91
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:40
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:314
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:157
 msgid "BSSID"
 msgstr "BSSID"
 
@@ -753,7 +765,7 @@ msgstr "概要へ戻る"
 msgid "Back to configuration"
 msgstr "設定へ戻る"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:215
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
 msgid "Back to overview"
 msgstr "概要へ戻る"
 
@@ -778,11 +790,11 @@ msgid "Bad address specified!"
 msgstr "無効なアドレスです!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:153
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:285
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:287
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:260
 msgid "Beacon Interval"
 msgstr "ビーコン間隔"
 
@@ -812,9 +824,9 @@ msgstr "インターフェースのバインド"
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:118
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:46
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:325
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:168
 msgid "Bitrate"
 msgstr "ビットレート"
 
@@ -830,7 +842,7 @@ msgstr "ブリッジ"
 msgid "Bridge interfaces"
 msgstr "ブリッジ インターフェース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:244
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
 msgid "Bridge unit number"
 msgstr "ブリッジ ユニット番号"
 
@@ -846,7 +858,7 @@ msgstr "Broadcom 802.11%s 無線LANコントローラ"
 msgid "Broadcom BCM%04x 802.11 Wireless Controller"
 msgstr "Broadcom BCM%04x 802.11 無線LANコントローラ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:402
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "バッファ"
 
@@ -864,7 +876,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:185
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "キャンセル"
@@ -881,17 +893,17 @@ msgstr "注意: 設定ファイルは消去されます"
 msgid "Caution: System upgrade will be forced"
 msgstr "注意: システムは強制的にアップグレードされます"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:87
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:89
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:275
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:48
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:234
 msgid "Chain"
 msgstr "チェイン"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:12
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
 msgid "Change login password"
-msgstr ""
+msgstr "ログイン パスワードの変更"
 
 #: modules/luci-base/luasrc/controller/admin/uci.lua:12
 #: modules/luci-base/luasrc/view/admin_uci/changes.htm:16
@@ -906,24 +918,24 @@ msgstr "変更が適用されました。"
 msgid "Changes have been reverted."
 msgstr "変更は取り消されました。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:44
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:9
 msgid "Changes the administrator password for accessing the device"
 msgstr "デバイスの管理者パスワードを変更します"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:13
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
 msgid "Changing password…"
-msgstr ""
+msgstr "パスワードを変更中…"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:157
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:172
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:197
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:117
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:42
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:324
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:167
 msgid "Channel"
 msgstr "チャネル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:117
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
 msgid ""
 "Channel %d is not available in the %s regulatory domain and has been auto-"
 "adjusted to %d."
@@ -965,7 +977,7 @@ msgstr ""
 "フィールドにゾーン名を入力すると、新しくゾーンを作成し、このインターフェース"
 "に設定します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:391
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:393
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -973,7 +985,7 @@ msgstr ""
 "無線インターフェースをアタッチするネットワークを選択してください。または、"
 "<em>作成</em>欄を選択すると新しいネットワークを作成します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:602
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:604
 msgid "Cipher"
 msgstr "暗号化方式"
 
@@ -997,8 +1009,8 @@ msgstr ""
 "指定した mtdblock ファイルをダウンロードするには、 \"mtdblock を保存\" をク"
 "リックしてください。（注: この機能はプロフェッショナル向けです！）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:459
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
 msgid "Client"
 msgstr "クライアント"
 
@@ -1007,10 +1019,10 @@ msgstr "クライアント"
 msgid "Client ID to send when requesting DHCP"
 msgstr "DHCPリクエスト時に送信するクライアントID"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:154
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
@@ -1032,16 +1044,16 @@ msgstr "リストを閉じる"
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:42
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:97
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:62
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:207
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:73
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:367
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:421
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:440
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:450
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:317
+#: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
+#: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
+#: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:17
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:68
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:33
 msgid "Collecting data..."
 msgstr "データ収集中です..."
@@ -1050,7 +1062,7 @@ msgstr "データ収集中です..."
 msgid "Command"
 msgstr "コマンド"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:105
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "コメント"
 
@@ -1058,7 +1070,7 @@ msgstr "コメント"
 msgid "Common Configuration"
 msgstr "一般設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1097
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1125
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1094,21 +1106,21 @@ msgstr "設定が適用されました。"
 msgid "Configuration has been rolled back!"
 msgstr "設定はロールバックされました！"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:57
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:22
 msgid "Confirmation"
 msgstr "確認"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:50
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
 msgid "Connect"
 msgstr "接続"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:44
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:215
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:240
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:62
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 msgid "Connected"
 msgstr "接続中"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
 msgid "Connection Limit"
 msgstr "接続制限"
 
@@ -1130,13 +1142,13 @@ msgstr ""
 "レスや無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、"
 "再接続が必要かもしれません。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
 msgid "Country"
 msgstr "国"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:224
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:230
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:226
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:232
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:336
 msgid "Country Code"
 msgstr "国コード"
 
@@ -1196,6 +1208,18 @@ msgstr ""
 "<abbr title=\"Light Emitting Diode\">LED</abbr> デバイスの挙動をカスタマイズ"
 "します。"
 
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:760
+msgid "DAE-Client"
+msgstr ""
+
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:768
+msgid "DAE-Port"
+msgstr ""
+
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:776
+msgid "DAE-Secret"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
 msgid "DHCP Server"
@@ -1226,16 +1250,16 @@ msgstr "DHCPv6-モード"
 msgid "DHCPv6-Service"
 msgstr "DHCPv6-サービス"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:209
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:210
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:211
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:212
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:213
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:235
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:236
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:237
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:238
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:239
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:56
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:57
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:58
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:59
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:60
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:81
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:82
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:83
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:84
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
 msgid "DNS"
 msgstr "DNS"
 
@@ -1263,20 +1287,20 @@ msgstr ""
 msgid "DS-Lite AFTR address"
 msgstr "DS-Lite AFTR アドレス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:151
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:437
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:251
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:95
 msgid "DSL Status"
 msgstr "DSL ステータス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:507
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
 msgid "DTIM Interval"
 msgstr "DTIM インターバル"
 
@@ -1284,7 +1308,7 @@ msgstr "DTIM インターバル"
 msgid "DUID"
 msgstr "DUID"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:258
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:102
 msgid "Data Rate"
 msgstr ""
 
@@ -1293,8 +1317,9 @@ msgstr ""
 msgid "Debug"
 msgstr "デバッグ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:718
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:742
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:720
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:744
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:768
 msgid "Default %d"
 msgstr "標準設定 %d"
 
@@ -1334,20 +1359,20 @@ msgstr ""
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:11
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:59
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "削除"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:187
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
 msgid "Delete key"
-msgstr ""
+msgstr "公開鍵を削除"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:112
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
 msgid "Delete this network"
 msgstr "ネットワークを削除します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:507
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Delivery Traffic Indication Message インターバル"
 
@@ -1355,16 +1380,16 @@ msgstr "Delivery Traffic Indication Message インターバル"
 msgid "Description"
 msgstr "詳細"
 
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:62
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:361
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:103
 msgid "Destination"
 msgstr "宛先"
 
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:43
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:12
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:203
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:50
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:75
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1373,7 +1398,7 @@ msgstr "宛先"
 msgid "Device"
 msgstr "デバイス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:136
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
 msgid "Device Configuration"
 msgstr "デバイス設定"
 
@@ -1402,8 +1427,8 @@ msgstr ""
 msgid "Directory"
 msgstr "ディレクトリ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:129
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:106
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
 msgid "Disable"
 msgstr "無効"
 
@@ -1419,11 +1444,11 @@ msgstr ""
 msgid "Disable Encryption"
 msgstr "暗号化を無効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:518
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:520
 msgid "Disable Inactivity Polling"
 msgstr "非アクティブ状態ポーリングを無効化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:106
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
 msgid "Disable this network"
 msgstr "このネットワークを無効にします"
 
@@ -1437,11 +1462,11 @@ msgstr "このネットワークを無効にします"
 msgid "Disabled"
 msgstr "無効"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1066
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1094
 msgid "Disabled (default)"
 msgstr "無効（デフォルト）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:532
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
 msgid "Disassociate On Low Acknowledgement"
 msgstr "低 Acknowledgement 時のアソシエーション解除"
 
@@ -1459,21 +1484,21 @@ msgid "Disconnection attempt failed"
 msgstr "切断の試行が失敗しました"
 
 #: modules/luci-base/luasrc/view/cbi/apply_widget.htm:46
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:21
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "Dismiss"
 msgstr "警告の除去"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:237
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:331
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:239
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:333
 msgid "Distance Optimization"
 msgstr "距離の最適化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:238
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
 msgid "Distance to farthest network member in meters."
 msgstr "最も遠い端末との距離(メートル)を設定してください。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:344
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:346
 msgid "Diversity"
 msgstr "ダイバシティ"
 
@@ -1502,9 +1527,9 @@ msgstr "パブリック DNSサーバーが返答できなかったリクエス
 msgid "Do not forward reverse lookups for local networks"
 msgstr "ローカル ネットワークへの逆引きを転送しません"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
-msgstr ""
+msgstr "本当に以下の SSH 公開鍵を削除しますか？"
 
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:25
 msgid "Domain required"
@@ -1538,7 +1563,7 @@ msgstr "バックアップ アーカイブのダウンロード"
 msgid "Download mtdblock"
 msgstr "mtdblock のダウンロード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:189
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
 msgid "Downstream SNR offset"
 msgstr ""
 
@@ -1579,14 +1604,14 @@ msgstr ""
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:917
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
 msgid "EAP-Method"
 msgstr "EAPメソッド"
 
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:56
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:109
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
 msgid "Edit"
 msgstr "編集"
 
@@ -1598,11 +1623,11 @@ msgstr ""
 "上記の設定データを直接編集してエラーを修正し、 \"保存\" ボタンを押してこの"
 "ページをリロードします。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:56
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
 msgid "Edit this interface"
 msgstr "インターフェースを編集します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:109
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
 msgid "Edit this network"
 msgstr "ネットワークを編集"
 
@@ -1610,8 +1635,8 @@ msgstr "ネットワークを編集"
 msgid "Emergency"
 msgstr "緊急"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:125
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:103
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
 msgid "Enable"
 msgstr "有効"
 
@@ -1663,11 +1688,11 @@ msgstr "TFTPサーバーを有効にする"
 msgid "Enable VLAN functionality"
 msgstr "VLAN機能を有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1096
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1124
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Key Reinstallation (KRACK) 対策の有効化"
 
@@ -1691,7 +1716,7 @@ msgstr "カプセル化されたパケットの DF (Don't Fragment) フラグを
 msgid "Enable this mount"
 msgstr "マウント設定を有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:103
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
 msgid "Enable this network"
 msgstr "このネットワークを有効にします"
 
@@ -1713,7 +1738,7 @@ msgstr "有効"
 msgid "Enables IGMP snooping on this bridge"
 msgstr "ブリッジの IGMP スヌーピングを有効にします"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:825
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1725,16 +1750,16 @@ msgstr ""
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "スパニングツリー プロトコルを有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:239
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
 msgid "Encapsulation mode"
 msgstr "カプセル化モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:591
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:200
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:92
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:41
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:315
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:593
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:158
 msgid "Encryption"
 msgstr "暗号化モード"
 
@@ -1758,12 +1783,16 @@ msgstr "カスタム値を入力"
 msgid "Erasing..."
 msgstr "消去中..."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:97
 msgid "Error"
 msgstr "エラー"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:266
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:110
 msgid "Errored seconds (ES)"
 msgstr ""
 
@@ -1783,11 +1812,11 @@ msgstr "除外インターフェース"
 msgid "Expand hosts"
 msgstr "拡張ホスト設定"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:279
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:278
 msgid "Expecting %s"
 msgstr "期待される値: %s"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:214
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:61
 msgid "Expires"
 msgstr "期限切れ"
 
@@ -1802,11 +1831,11 @@ msgstr ""
 msgid "External"
 msgstr "外部"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:898
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:926
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:907
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:935
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1826,15 +1855,15 @@ msgstr "外部システムログ・サーバー プロトコル"
 msgid "Extra SSH command options"
 msgstr "拡張 SSHコマンドオプション"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:869
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:895
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:896
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:867
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:893
 msgid "FT protocol"
 msgstr ""
 
@@ -1876,7 +1905,7 @@ msgstr ""
 "現在アタッチされている全てのファイルシステムとスワップを検索し、検出結果に基"
 "づいてデフォルト設定を置き換えます。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:82
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
 msgid "Find and join network"
 msgstr "ネットワークの検索と参加"
 
@@ -1896,15 +1925,15 @@ msgstr ""
 msgid "Firewall Settings"
 msgstr "ファイアウォール設定"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:297
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:44
 msgid "Firewall Status"
 msgstr "ファイアウォール ステータス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:196
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
 msgid "Firmware File"
 msgstr "ファームウェア ファイル"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:385
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:20
 msgid "Firmware Version"
 msgstr "ファームウェア バージョン"
 
@@ -1936,11 +1965,11 @@ msgstr "更新中..."
 msgid "Force"
 msgstr "強制"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:257
 msgid "Force 40MHz mode"
 msgstr "強制 40MHz モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:610
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:612
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) を使用"
 
@@ -1949,11 +1978,11 @@ msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "別のDHCPサーバーが検出された場合でも、DHCPサーバー機能を強制的に起動します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:611
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:613
 msgid "Force TKIP"
 msgstr "TKIP を使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:612
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
 msgid "Force TKIP and CCMP (AES)"
 msgstr "TKIP 及びCCMP (AES) を使用"
 
@@ -1977,7 +2006,7 @@ msgstr "フォーム トークンの不一致"
 msgid "Forward DHCP traffic"
 msgstr "DHCPトラフィックを転送する"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:265
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:109
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
@@ -1985,25 +2014,25 @@ msgstr ""
 msgid "Forward broadcast traffic"
 msgstr "ブロードキャスト トラフィックを転送する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:374
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:245
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
 msgid "Forwarding mode"
 msgstr "転送モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:252
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:584
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:254
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
 msgid "Fragmentation Threshold"
 msgstr "フラグメンテーションしきい値"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:331
 msgid "Frame Bursting"
 msgstr "フレームバースト"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:401
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:412
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "空き"
 
@@ -2015,9 +2044,9 @@ msgstr ""
 "WireGuard インターフェースとピアについての詳細情報: <a href=\"http://"
 "wireguard.com\">wireguard.com</a>"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:117
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:42
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:324
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:167
 msgid "GHz"
 msgstr "GHz"
 
@@ -2026,8 +2055,8 @@ msgstr "GHz"
 msgid "GPRS only"
 msgstr "GPRSのみ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:208
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:234
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:55
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:80
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
@@ -2048,9 +2077,9 @@ msgstr "一般設定"
 
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:234
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:139
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:358
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:360
 msgid "General Setup"
 msgstr "一般設定"
 
@@ -2058,7 +2087,7 @@ msgstr "一般設定"
 msgid "Generate Config"
 msgstr "コンフィグ生成"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:874
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:900
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2070,7 +2099,7 @@ msgstr "バックアップ アーカイブを生成"
 msgid "Generic 802.11%s Wireless Controller"
 msgstr "802.11%s 無線LANコントローラ"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "入力されたパスワードが一致しません。パスワードは変更されませんでした!"
 
@@ -2078,12 +2107,12 @@ msgstr "入力されたパスワードが一致しません。パスワードは
 msgid "Global Settings"
 msgstr "全体設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:253
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
 msgid "Global network options"
 msgstr "グローバル ネットワークオプション"
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:198
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:245
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:235
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:262
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:288
 msgid "Go to password configuration..."
@@ -2110,7 +2139,7 @@ msgstr "HE.net パスワード"
 msgid "HE.net username"
 msgstr "HE.net ユーザー名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:307
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:309
 msgid "HT mode (802.11n)"
 msgstr "HT モード (802.11n)"
 
@@ -2118,7 +2147,7 @@ msgstr "HT モード (802.11n)"
 msgid "Hang Up"
 msgstr "再起動"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:270
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:114
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
@@ -2129,14 +2158,14 @@ msgid ""
 msgstr ""
 "このページではホスト名やタイムゾーンなどの基本的な設定を行うことが出来ます。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:487
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:567
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:489
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:546
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:569
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>の隠匿"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:140
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:310
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:61
 msgid "Hide empty chains"
 msgstr "空のチェインを非表示"
 
@@ -2165,7 +2194,7 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:71
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:283
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua:15
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:382
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:35
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:129
 msgid "Hostname"
@@ -2208,23 +2237,32 @@ msgstr "無効な IP アドレスです"
 msgid "IP address is missing"
 msgstr "IP アドレスがありません"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:18
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:73
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:88
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:127
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:32
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:42
 msgid "IPv4"
 msgstr "IPv4"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:301
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:49
 msgid "IPv4 Firewall"
 msgstr "IPv4 ファイアウォール"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:199
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:46
 msgid "IPv4 Upstream"
 msgstr "IPv4 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:11
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
 msgid "IPv4 address"
 msgstr "IPv4 アドレス"
 
@@ -2232,21 +2270,21 @@ msgstr "IPv4 アドレス"
 msgid "IPv4 assignment length"
 msgstr "IPv4 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:28
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:24
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
 msgid "IPv4 gateway"
 msgstr "IPv4 ゲートウェイ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:16
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
 msgid "IPv4 netmask"
 msgstr "IPv4 ネットマスク"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:356
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:355
 msgid "IPv4 network in address/netmask notation"
-msgstr ""
+msgstr "IPv4 ネットワーク（アドレス/ネットマスク 表記）"
 
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
 msgid "IPv4 prefix"
@@ -2269,15 +2307,33 @@ msgstr "IPv4-アドレス"
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-in-IPv4 (RFC2003)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:23
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:25
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:27
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:74
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:89
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:136
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:39
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:44
 msgid "IPv6"
 msgstr "IPv6"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:302
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:52
 msgid "IPv6 Firewall"
 msgstr "IPv6 ファイアウォール"
 
@@ -2289,33 +2345,33 @@ msgstr ""
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:254
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA-プレフィクス"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:225
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:71
 msgid "IPv6 Upstream"
 msgstr "IPv6 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:51
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
 msgid "IPv6 address"
 msgstr "IPv6 アドレス"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:47
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:41
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "IPv6 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 gateway"
 msgstr "IPv6 ゲートウェイ"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:361
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:360
 msgid "IPv6 network in address/netmask notation"
 msgstr "IPv6 ネットワーク（アドレス/ネットマスク 表記）"
 
@@ -2329,12 +2385,12 @@ msgstr "IPv6 プレフィクス"
 msgid "IPv6 prefix length"
 msgstr "IPv6 プレフィクス長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:61
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:66
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
 msgid "IPv6 suffix"
 msgstr "IPv6 サフィックス"
 
@@ -2343,8 +2399,8 @@ msgstr "IPv6 サフィックス"
 msgid "IPv6-Address"
 msgstr "IPv6-アドレス"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:142
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:44
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
@@ -2360,7 +2416,7 @@ msgstr "IPv6-over-IPv4 (6rd)"
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-over-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1002
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1030
 msgid "Identity"
 msgstr "識別子"
 
@@ -2451,7 +2507,7 @@ msgstr "リゾルバ ファイルを無視する"
 msgid "Image"
 msgstr "イメージ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:100
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:59
 msgid "In"
 msgstr "イン"
 
@@ -2502,7 +2558,7 @@ msgstr ""
 msgid "Install package %q"
 msgstr "%q パッケージをインストールします"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:163
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Install protocol extensions..."
 msgstr "プロトコル拡張機能をインストールします..."
 
@@ -2520,24 +2576,24 @@ msgstr "インターフェース"
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:353
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:355
 msgid "Interface Configuration"
 msgstr "インターフェース設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
 msgid "Interface Overview"
 msgstr "インターフェース一覧"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "インターフェース再接続中..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:501
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
 msgid "Interface name"
 msgstr "インターフェース名"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:177
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:130
 msgid "Interface not present or not connected yet."
 msgstr "インターフェースが存在しないか、接続していません"
 
@@ -2556,7 +2612,7 @@ msgid "Internal Server Error"
 msgstr "内部サーバー エラー"
 
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:192
-#: modules/luci-base/luasrc/view/cbi/tsection.htm:39
+#: modules/luci-base/luasrc/view/cbi/tsection.htm:37
 msgid "Invalid"
 msgstr "入力値が不正です"
 
@@ -2573,7 +2629,7 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 "ユーザー名かパスワード、もしくは両方が不正です！もう一度入力してください。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:496
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:498
 msgid "Isolate Clients"
 msgstr "クライアント間の分離"
 
@@ -2587,17 +2643,17 @@ msgstr ""
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:205
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:220
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:252
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:242
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:252
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:295
 msgid "JavaScript required!"
 msgstr "JavaScriptを有効にしてください!"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
 msgid "Join Network"
 msgstr "ネットワークに接続する"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:189
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
 msgid "Join Network: Wireless Scan"
 msgstr "ネットワークに接続する: 無線LANスキャン"
 
@@ -2614,19 +2670,19 @@ msgstr "設定を保持する"
 msgid "Kernel Log"
 msgstr "カーネル ログ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:389
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:24
 msgid "Kernel Version"
 msgstr "カーネル バージョン"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:758
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:784
 msgid "Key"
 msgstr "暗号キー"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:784
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:785
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:786
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:787
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:803
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:810
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:811
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:812
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:813
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:829
 msgid "Key #%d"
 msgstr "キー #%d"
 
@@ -2660,7 +2716,7 @@ msgstr "LCP echo 失敗数しきい値"
 msgid "LCP echo interval"
 msgstr "LCP echo 送信間隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:240
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
 msgid "LLC"
 msgstr "LLC"
 
@@ -2677,7 +2733,7 @@ msgstr "言語"
 msgid "Language and Style"
 msgstr "言語とスタイル"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:260
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:104
 msgid "Latency"
 msgstr "レイテンシー"
 
@@ -2730,19 +2786,19 @@ msgstr ""
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "待ち受けをこれらのインターフェースとループバックに制限します。"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:261
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Line Attenuation (LATN)"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:254
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:98
 msgid "Line Mode"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:253
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:97
 msgid "Line State"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:255
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:99
 msgid "Line Uptime"
 msgstr ""
 
@@ -2758,7 +2814,7 @@ msgstr ""
 "問い合わせを転送する<abbr title=\"Domain Name System\">DNS</abbr> サーバーの"
 "リストを設定します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:899
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:927
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2767,7 +2823,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:908
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:936
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2812,7 +2868,7 @@ msgstr "DNSクエリを受信するポート"
 msgid "Load"
 msgstr "負荷"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:392
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:27
 msgid "Load Average"
 msgstr "システム平均負荷"
 
@@ -2822,9 +2878,9 @@ msgstr "システム平均負荷"
 msgid "Loading"
 msgstr "ロード中"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:236
+#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
 msgid "Loading SSH keys…"
-msgstr ""
+msgstr "SSH 鍵をロード中…"
 
 #: modules/luci-base/luasrc/model/network.lua:30
 msgid "Local IP address is invalid"
@@ -2855,7 +2911,7 @@ msgstr "ローカルサービスのみ"
 msgid "Local Startup"
 msgstr "ローカル スタートアップ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:390
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:31
 msgid "Local Time"
 msgstr "時刻"
@@ -2894,7 +2950,7 @@ msgstr ""
 msgid "Localise queries"
 msgstr "ローカライズクエリ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:173
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
 msgid "Locked to channel %s used by: %s"
 msgstr "チャネル %s にロックされています。次で使用されています: %s"
 
@@ -2918,7 +2974,7 @@ msgstr "ログイン"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:268
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:112
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
@@ -2927,32 +2983,32 @@ msgid "Lowest leased address as offset from the network address."
 msgstr ""
 "ネットワークアドレスをオフセットとして、最小のアドレスを設定してください"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:45
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:113
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
 msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:204
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:230
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:51
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-アドレス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:445
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:574
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:447
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
 msgid "MAC-Address Filter"
 msgstr "MAC-アドレス フィルタ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:140
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:360
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
 msgid "MAC-Filter"
 msgstr "MAC-フィルタ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:578
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:454
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:580
 msgid "MAC-List"
 msgstr "MAC-リスト"
 
@@ -2999,11 +3055,11 @@ msgstr ""
 msgid "Manual"
 msgstr "手動"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:259
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:103
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:527
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:529
 msgid "Maximum allowed Listen Interval"
 msgstr "許容される最大 Listen 間隔"
 
@@ -3037,15 +3093,15 @@ msgid "Maximum number of leased addresses."
 msgstr "リースされるアドレスの最大数です。"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:118
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:168
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:325
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:397
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:13
 msgid "Memory"
 msgstr "メモリー"
 
@@ -3053,7 +3109,7 @@ msgstr "メモリー"
 msgid "Memory usage (%)"
 msgstr "メモリ使用率 (%)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:371
 msgid "Mesh Id"
 msgstr ""
 
@@ -3077,22 +3133,20 @@ msgstr "ミラー元ポート"
 msgid "Missing protocol extension for proto %q"
 msgstr "プロトコル %qのプロトコル拡張が見つかりません"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:878
 msgid "Mobility Domain"
 msgstr "モビリティ ドメイン"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:149
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:198
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:90
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:99
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:57
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:313
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:365
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:156
 msgid "Mode"
 msgstr "モード"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:383
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:18
 msgid "Model"
 msgstr "モデル"
 
@@ -3116,9 +3170,9 @@ msgstr ""
 msgid "Modem init timeout"
 msgstr "モデム初期化タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:440
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:542
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:565
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:442
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:567
 msgid "Monitor"
 msgstr "モニター"
 
@@ -3181,7 +3235,7 @@ msgstr "下へ移動"
 msgid "Move up"
 msgstr "上へ移動"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:841
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:867
 msgid "NAS ID"
 msgstr "NAS ID"
 
@@ -3228,15 +3282,15 @@ msgstr "新しいネットワークの名前"
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:207
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 msgid "Netmask"
 msgstr "ネットマスク"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:62
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:390
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:392
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:358
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:418
+#: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:101
 msgid "Network"
@@ -3254,7 +3308,7 @@ msgstr "ネットワークブート用イメージ"
 msgid "Network device is not present"
 msgstr "ネットワーク デバイスが存在しません"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:125
 msgid "Network without interfaces."
 msgstr "インターフェースの無いネットワークです。"
 
@@ -3279,8 +3333,8 @@ msgid "No files found"
 msgstr "ファイルが見つかりませんでした"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:172
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:174
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:329
 msgid "No information available"
 msgstr "情報がありません"
 
@@ -3292,7 +3346,7 @@ msgstr ""
 msgid "No negative cache"
 msgstr "ネガティブキャッシュを行なわない"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:120
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
 msgid "No network configured on this device"
 msgstr "このデバイスに設定されているネットワークがありません"
 
@@ -3302,37 +3356,37 @@ msgstr "ネットワーク名が設定されていません"
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:195
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:103
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:242
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:232
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:259
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:283
 msgid "No password set!"
 msgstr "パスワードが設定されていません!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
-msgstr ""
+msgstr "まだ公開鍵はありません。"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:124
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:83
 msgid "No rules in this chain."
 msgstr "チェイン内にルールがありません"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:171
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:146
 msgid "No scan results available yet..."
 msgstr "利用可能なスキャン結果はまだありません..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:25
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
 msgid "No zone assigned"
 msgstr "ゾーンが設定されていません"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:81
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:32
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
 msgid "Noise"
 msgstr "ノイズ"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:263
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:107
 msgid "Noise Margin (SNR)"
 msgstr ""
 
@@ -3340,7 +3394,7 @@ msgstr ""
 msgid "Noise:"
 msgstr "ノイズ:"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:271
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:115
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
@@ -3348,8 +3402,8 @@ msgstr ""
 msgid "Non-wildcard"
 msgstr "非ワイルドカード"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:94
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:49
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
 msgid "None"
 msgstr "なし"
 
@@ -3361,13 +3415,13 @@ msgstr "標準"
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:94
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:70
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
 msgid "Not associated"
 msgstr "アソシエーションされていません"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:205
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:231
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:77
 msgid "Not connected"
 msgstr "未接続"
 
@@ -3459,7 +3513,7 @@ msgstr "リストを開く..."
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:176
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
 msgid "Operating frequency"
 msgstr "動作周波数"
 
@@ -3471,7 +3525,7 @@ msgstr "変更されるオプション"
 msgid "Option removed"
 msgstr "削除されるオプション"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1095
 #: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
 msgid "Optional"
 msgstr "オプション"
@@ -3482,7 +3536,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:67
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3532,7 +3586,7 @@ msgstr ""
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "発信パケットと受信パケットに使用されるUDPポート（オプション）"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:104
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:63
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:212
 msgid "Options"
 msgstr "オプション"
@@ -3541,7 +3595,7 @@ msgstr "オプション"
 msgid "Other:"
 msgstr "その他:"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:101
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:60
 msgid "Out"
 msgstr "アウト"
 
@@ -3554,14 +3608,14 @@ msgid "Output Interface"
 msgstr "出力インターフェース"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "MACアドレスを上書きする"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:81
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3582,7 +3636,7 @@ msgstr ""
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:501
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
 msgid "Override default interface name"
 msgstr "デフォルトのインターフェース名を上書きします。"
 
@@ -3646,7 +3700,7 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "PIN コードが拒否されました"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:893
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:921
 msgid "PMK R1 Push"
 msgstr ""
 
@@ -3682,25 +3736,25 @@ msgstr ""
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:140
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
 msgid "Package libiwinfo required!"
 msgstr "libiwinfo パッケージが必要です！"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:87
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "パケット"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:25
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
 msgid "Part of zone %q"
 msgstr "ゾーン %q の一部"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1038
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:49
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1066
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
 #: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
 #: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
 msgid "Password"
@@ -3710,11 +3764,11 @@ msgstr "パスワード"
 msgid "Password authentication"
 msgstr "パスワード認証"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:974
 msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:994
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1022
 msgid "Password of inner Private Key"
 msgstr "秘密鍵のパスワード"
 
@@ -3722,31 +3776,31 @@ msgstr "秘密鍵のパスワード"
 msgid "Password2"
 msgstr "パスワード2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:238
+#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
 msgid "Paste or drag SSH key file…"
-msgstr ""
+msgstr "貼付けまたは SSH 鍵ファイルをドラッグ…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:927
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:955
 msgid "Path to CA-Certificate"
 msgstr "CA証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:934
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:962
 msgid "Path to Client-Certificate"
 msgstr "クライアント証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:968
 msgid "Path to Private Key"
 msgstr "秘密鍵のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:976
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1004
 msgid "Path to inner CA-Certificate"
 msgstr "CA 証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:982
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1010
 msgid "Path to inner Client-Certificate"
 msgstr "クライアント証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:988
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1016
 msgid "Path to inner Private Key"
 msgstr "秘密鍵のパス"
 
@@ -3805,14 +3859,14 @@ msgstr "デバイス設定"
 msgid "Ping"
 msgstr "Ping"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:48
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:49
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:116
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:117
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:23
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:55
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:170
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:96
 msgid "Pkts."
 msgstr "パケット"
 
@@ -3820,7 +3874,7 @@ msgstr "パケット"
 msgid "Please enter your username and password."
 msgstr "ユーザー名とパスワードを入力してください。"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:87
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Policy"
 msgstr "ポリシー"
 
@@ -3832,11 +3886,11 @@ msgstr "ポート"
 msgid "Port status:"
 msgstr "ポート ステータス:"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:274
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:118
 msgid "Power Management Mode"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:272
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:116
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
@@ -3848,7 +3902,7 @@ msgstr ""
 msgid "Prefer UMTS"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:232
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:78
 msgid "Prefix Delegated"
 msgstr "委任されたプレフィクス (PD)"
 
@@ -3873,8 +3927,8 @@ msgstr ""
 msgid "Prevent listening on these interfaces."
 msgstr "これらのインターフェースでの待ち受けを停止します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:497
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:550
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:552
 msgid "Prevents client-to-client communication"
 msgstr "クライアント同士の通信を制限します"
 
@@ -3891,19 +3945,19 @@ msgstr "続行"
 msgid "Processes"
 msgstr "プロセス"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:257
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:101
 msgid "Profile"
 msgstr "プロファイル"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:99
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:58
 msgid "Prot."
 msgstr "プロトコル"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:102
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:77
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:359
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:205
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:231
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -3919,11 +3973,11 @@ msgstr "プロトコル サポートがインストールされていません"
 msgid "Provide NTP server"
 msgstr "NTPサーバー機能を有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:83
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
 msgid "Provide new network"
 msgstr "新しいネットワークを設定します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:439
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:441
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "擬似アドホック (ahdemo)"
 
@@ -3931,15 +3985,19 @@ msgstr "擬似アドホック (ahdemo)"
 msgid "Public Key"
 msgstr "公開鍵"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:231
+#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
 "device, paste an OpenSSH compatible public key line or drag a <code>.pub</"
 "code> file into the input field."
 msgstr ""
+"公開鍵は、プレーン パスワードの使用と比べ、高セキュリティなパスワード無しで"
+"の SSH ログインを可能とします。新しい鍵をデバイスにアップロードするために、入"
+"力欄に OpenSSH 互換の公開鍵（1行）を貼り付けるか、 <code>.pub</code> ファイル"
+"をドラッグしてください。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:62
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -3947,8 +4005,8 @@ msgstr ""
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:47
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:311
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:154
 msgid "Quality"
 msgstr "クオリティ"
 
@@ -3960,11 +4018,11 @@ msgstr ""
 "アップストリームの利用可能な全 <abbr title=\"Domain Name System\">DNS</abbr> "
 "サーバを問い合わせます"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:879
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:907
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:886
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:914
 msgid "R1 Key Holder"
 msgstr ""
 
@@ -3972,14 +4030,14 @@ msgstr ""
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 NAT-Tモード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:253
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:585
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTSしきい値"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:48
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:116
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:23
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
 msgstr "RX"
 
@@ -3987,27 +4045,27 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "受信レート"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:742
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:744
 msgid "Radius-Accounting-Port"
 msgstr "Radiusアカウントサーバー ポート番号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:750
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:752
 msgid "Radius-Accounting-Secret"
 msgstr "Radiusアカウント秘密鍵"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:734
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:736
 msgid "Radius-Accounting-Server"
 msgstr "Radiusアカウントサーバー"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:718
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:720
 msgid "Radius-Authentication-Port"
 msgstr "Radius認証サーバー ポート番号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:726
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:728
 msgid "Radius-Authentication-Secret"
 msgstr "Radius認証秘密鍵"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:710
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:712
 msgid "Radius-Authentication-Server"
 msgstr "Radius認証サーバー"
 
@@ -4023,7 +4081,7 @@ msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>サーバーの設定"
 "として<code>/etc/ethers</code> をロードします"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:18
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:8
 msgid ""
 "Really delete this interface? The deletion cannot be undone! You might lose "
 "access to this device if you are connected via this interface"
@@ -4032,7 +4090,7 @@ msgstr ""
 "ません！もしこのインターフェースを経由して接続している場合、このデバイスにア"
 "クセスできなくなる場合があります"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:9
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
 msgid ""
 "Really delete this wireless network? The deletion cannot be undone! You "
 "might lose access to this device if you are connected via this network."
@@ -4070,7 +4128,7 @@ msgstr "リアルタイム・トラフィック"
 msgid "Realtime Wireless"
 msgstr "リアルタイム・無線LAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:860
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:886
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4096,8 +4154,8 @@ msgstr "デバイスのオペレーティングシステムを再起動します
 msgid "Receive"
 msgstr "受信"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:324
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
 msgid "Receiver Antenna"
 msgstr "受信アンテナ"
 
@@ -4105,12 +4163,12 @@ msgstr "受信アンテナ"
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "WireGuard インターフェースのIPアドレスです。（推奨）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:50
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
 msgid "Reconnect this interface"
 msgstr "インターフェースを再接続します"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:89
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:48
 msgid "References"
 msgstr "参照カウンタ"
 
@@ -4139,11 +4197,11 @@ msgstr "リモート IPv4アドレス"
 msgid "Remote IPv4 address or FQDN"
 msgstr "リモート IPv4アドレス または FQDN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:112
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
 msgid "Remove"
 msgstr "削除"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:220
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
 msgid "Repeat scan"
 msgstr "再スキャン"
 
@@ -4164,7 +4222,7 @@ msgstr "IPv6-アドレスのリクエスト"
 msgid "Request IPv6-prefix of length"
 msgstr "リクエストするIPv6-プレフィクス長"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1068
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1096
 msgid "Required"
 msgstr "必須"
 
@@ -4187,7 +4245,7 @@ msgid ""
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1089
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)"
@@ -4208,7 +4266,7 @@ msgstr ""
 msgid "Reset"
 msgstr "リセット"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:311
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:62
 msgid "Reset Counters"
 msgstr "カウンタをリセット"
 
@@ -4224,17 +4282,17 @@ msgstr "名前解決およびホストファイル設定"
 msgid "Resolve file"
 msgstr "リゾルバファイル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:81
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:67
 msgid "Restart"
 msgstr "再起動"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:312
+#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:63
 msgid "Restart Firewall"
 msgstr "ファイアウォールを再起動"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:81
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
 msgid "Restart radio interface"
 msgstr "無線インターフェースを再起動します"
 
@@ -4247,8 +4305,8 @@ msgid "Restore backup"
 msgstr "バックアップから復元する"
 
 #: modules/luci-base/luasrc/view/cbi/value.htm:24
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:52
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:60
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:17
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:25
 msgid "Reveal/hide password"
 msgstr "パスワードを表示する/隠す"
 
@@ -4296,7 +4354,7 @@ msgid "Router Advertisement-Service"
 msgstr "ルーター アドバタイズメント-サービス"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:41
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:6
 msgid "Router Password"
 msgstr "ルーター パスワード"
 
@@ -4314,7 +4372,7 @@ msgstr ""
 "特定のホスト又はネットワークに、どのインターフェース及びゲートウェイを通して"
 "通信を行うか、経路情報を設定します。"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:281
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:240
 msgid "Rule"
 msgstr "ルール"
 
@@ -4337,7 +4395,7 @@ msgstr "SNR"
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
 msgid "SSH Access"
-msgstr "SSHアクセス"
+msgstr "SSH アクセス"
 
 #: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
 msgid "SSH server address"
@@ -4352,16 +4410,14 @@ msgid "SSH username"
 msgstr "SSH ユーザー名"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:228
+#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
 msgid "SSH-Keys"
-msgstr "SSHキー"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:196
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:89
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:98
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:39
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:56
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:312
+msgstr "SSH キー"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:155
 msgid "SSID"
 msgstr "SSID"
 
@@ -4372,7 +4428,7 @@ msgstr "スワップ"
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:67
+#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:32
 msgid "Save"
 msgstr "保存"
 
@@ -4389,15 +4445,15 @@ msgstr "mtdblock を保存"
 msgid "Save mtdblock contents"
 msgstr "mtdblock の保存"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
 msgid "Saving keys…"
-msgstr ""
+msgstr "公開鍵を保存中…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:82
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
 msgid "Scan"
 msgstr "スキャン"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
 msgid "Scan request failed"
 msgstr "スキャン要求が失敗しました"
 
@@ -4441,7 +4497,7 @@ msgstr ""
 "設定された秒間隔でLCP echoリクエストを送信します。失敗数しきい値を設定した場"
 "合のみ、機能が有効になります。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:549
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:551
 msgid "Separate Clients"
 msgstr "クライアントの分離"
 
@@ -4464,7 +4520,7 @@ msgstr "サービス"
 
 #: modules/luci-base/htdocs/luci-static/resources/xhr.js:37
 msgid "Session expired"
-msgstr ""
+msgstr "セッションの期限切れ"
 
 #: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
 msgid "Set VPN as Default Route"
@@ -4492,7 +4548,7 @@ msgstr ""
 msgid "Setup DHCP Server"
 msgstr "DHCPサーバーを設定"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:267
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:111
 msgid "Severely Errored Seconds (SES)"
 msgstr ""
 
@@ -4500,7 +4556,7 @@ msgstr ""
 msgid "Short GI"
 msgstr "Short GI"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:504
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:506
 msgid "Short Preamble"
 msgstr "Short Preamble"
 
@@ -4508,26 +4564,26 @@ msgstr "Short Preamble"
 msgid "Show current backup file list"
 msgstr "現在のバックアップファイルのリストを表示する"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:140
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
 msgid "Show empty chains"
 msgstr "空のチェインを表示"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:53
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
 msgid "Shutdown this interface"
 msgstr "インターフェースを終了します"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:47
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:195
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:81
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:32
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:44
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:311
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:154
 msgid "Signal"
 msgstr "信号強度"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:262
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:106
 msgid "Signal Attenuation (SATN)"
 msgstr ""
 
@@ -4545,7 +4601,7 @@ msgstr "DNS クエリ キャッシュのサイズ"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:113
 msgid "Size of the ZRam device in megabytes"
-msgstr ""
+msgstr "ZRam デバイスのサイズ (MB) です。"
 
 #: modules/luci-base/luasrc/view/cbi/footer.htm:18
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:57
@@ -4562,7 +4618,7 @@ msgstr "コンテンツへ移動"
 msgid "Skip to navigation"
 msgstr "ナビゲーションへ移動"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
 msgid "Slot time"
 msgstr "スロット時間"
 
@@ -4592,8 +4648,8 @@ msgstr ""
 "ファームウェア更新は手動で行っていただく必要があります。wikiを参照して、この"
 "デバイスのインストール手順を参照してください。"
 
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:61
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:360
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:102
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:103
 msgid "Source"
 msgstr "送信元"
@@ -4652,7 +4708,7 @@ msgstr "優先順位"
 msgid "Starting configuration apply…"
 msgstr "設定の適用を開始しています..."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
 msgid "Starting wireless scan..."
 msgstr "無線LANのスキャンを開始しています..."
 
@@ -4690,18 +4746,18 @@ msgstr ""
 "名をアサインします。また、クライアントは対応するリースを使用するホストがその1"
 "台のみで、かつ静的なインターフェース設定にする必要があります。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:522
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:524
 msgid "Station inactivity limit"
 msgstr "非アクティブなステーションの制限"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:376
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:129
 msgid "Status"
 msgstr "ステータス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:53
+#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
 msgid "Stop"
 msgstr "停止"
@@ -4722,7 +4778,7 @@ msgstr "ログの抑制"
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "これらのプロトコルの、ルーチン的操作についてのログを抑制します。"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:408
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:24
 msgid "Swap"
 msgstr "スワップ"
 
@@ -4762,6 +4818,10 @@ msgstr ""
 msgid "Switch protocol"
 msgstr "プロトコルの切り替え"
 
+#: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
+msgid "Switch to CIDR list notation"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -4772,7 +4832,7 @@ msgid "Synchronizing..."
 msgstr "同期中..."
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:379
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
@@ -4804,9 +4864,9 @@ msgstr "TFTP設定"
 msgid "TFTP server root"
 msgstr "TFTPサーバー・ルート"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:49
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:117
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
 msgstr "TX"
 
@@ -4814,7 +4874,7 @@ msgstr "TX"
 msgid "TX Rate"
 msgstr "送信レート"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:51
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:77
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:105
 msgid "Table"
@@ -4822,7 +4882,7 @@ msgstr "テーブル"
 
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua:21
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua:68
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:98
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:57
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:74
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:102
 msgid "Target"
@@ -4836,7 +4896,7 @@ msgstr "対象ネットワーク"
 msgid "Terminate"
 msgstr "停止"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:25
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
 "radio hardware such as channel, transmit power or antenna selection which "
@@ -4850,7 +4910,7 @@ msgstr ""
 "や無線モードなどのネットワーク毎の設定は、<em>インターフェース設定</em>で設定"
 "を行います。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:141
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
 msgid ""
 "The <em>libiwinfo-lua</em> package is not installed. You must install this "
 "component for working wireless configuration!"
@@ -4947,15 +5007,17 @@ msgstr "以下の変更が取り消されました"
 msgid "The following rules are currently active on this system."
 msgstr "このシステムでは、現在以下のルールが有効になっています。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
 msgid "The given SSH public key has already been added."
-msgstr ""
+msgstr "入力された SSH 公開鍵は既に追加されています。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
+"入力された SSH 公開鍵は無効です。正しい RSA または ECDSA 鍵を入力してくださ"
+"い。"
 
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
 msgid "The given network name is not unique"
@@ -5028,9 +5090,9 @@ msgstr ""
 "わる可能性があるため、再接続時にあなたのコンピュータのIPアドレスを変更しなけ"
 "ればならない場合があります。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:19
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
 msgid "The system password has been successfully changed."
-msgstr ""
+msgstr "システム パスワードの変更に成功しました。"
 
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:118
 msgid ""
@@ -5072,7 +5134,7 @@ msgstr ""
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:196
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:104
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:243
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:233
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:260
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:286
 msgid ""
@@ -5169,7 +5231,7 @@ msgid "This page gives an overview over currently active network connections."
 msgstr "このページでは、現在アクティブなネットワーク接続を表示します。"
 
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
-#: modules/luci-base/luasrc/view/cbi/tsection.htm:29
+#: modules/luci-base/luasrc/view/cbi/tsection.htm:27
 msgid "This section contains no values yet"
 msgstr "このセクションは未設定です。"
 
@@ -5182,7 +5244,7 @@ msgstr "時刻設定"
 msgid "Time Synchronization is not configured yet."
 msgstr "時刻同期機能はまだ設定されていません。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:515
 msgid "Time interval for rekeying GTK"
 msgstr "Group Temporal Key (GTK) 再生成間隔"
 
@@ -5192,7 +5254,7 @@ msgstr "タイムゾーン"
 
 #: modules/luci-base/htdocs/luci-static/resources/xhr.js:47
 msgid "To login…"
-msgstr ""
+msgstr "ログイン…"
 
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:32
 msgid ""
@@ -5204,12 +5266,12 @@ msgstr ""
 "ださい。設定のリセットを行う場合、\"設定リセット\"をクリックしてください。(た"
 "だし、squashfsをお使いの場合のみ使用可能です)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:171
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
 msgid "Tone"
 msgstr ""
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:400
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:411
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:16
+#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:27
 msgid "Total Available"
 msgstr "合計"
 
@@ -5218,9 +5280,9 @@ msgstr "合計"
 msgid "Traceroute"
 msgstr "Traceroute"
 
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:56
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:24
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:87
-#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:97
 msgid "Traffic"
 msgstr "トラフィック"
 
@@ -5228,7 +5290,7 @@ msgstr "トラフィック"
 msgid "Transfer"
 msgstr "転送"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:583
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:585
 msgid "Transmission Rate"
 msgstr "転送レート"
 
@@ -5236,14 +5298,14 @@ msgstr "転送レート"
 msgid "Transmit"
 msgstr "送信"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:208
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:270
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:342
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:210
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:272
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:344
 msgid "Transmit Power"
 msgstr "電波出力"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:315
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:346
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:317
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:348
 msgid "Transmitter Antenna"
 msgstr "送信アンテナ"
 
@@ -5269,12 +5331,12 @@ msgstr "トンネルインターフェース"
 msgid "Tunnel Link"
 msgstr "トンネルリンク"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
 msgid "Tx-Power"
 msgstr "送信電力"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:42
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:323
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:166
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
 msgid "Type"
 msgstr "タイプ"
@@ -5333,7 +5395,7 @@ msgstr "AFTR ホスト名を解決できません"
 msgid "Unable to resolve peer host name"
 msgstr "ピアのホスト名を解決できません"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:269
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:113
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
@@ -5354,9 +5416,9 @@ msgstr "Unmanaged"
 msgid "Unmount"
 msgstr "アンマウント"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:116
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
 msgid "Unnamed key"
-msgstr ""
+msgstr "名称未設定の公開鍵"
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:148
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:209
@@ -5374,7 +5436,7 @@ msgstr "非対応の MAP タイプです"
 msgid "Unsupported modem"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:118
 msgid "Unsupported protocol type."
 msgstr "サポートされていないプロトコルタイプ"
 
@@ -5401,9 +5463,9 @@ msgstr "アーカイブをアップロード..."
 msgid "Uploaded File"
 msgstr "アップロード完了"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:106
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:17
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:391
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
+#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "起動時間"
 
@@ -5428,8 +5490,8 @@ msgstr "DHCPゲートウェイを使用する"
 msgid "Use DNS servers advertised by peer"
 msgstr "ピアから通知されたDNSサーバーを使用する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:224
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:230
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:226
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:232
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "ISO/IEC 3166 alpha2の国コードを使用します。"
 
@@ -5467,7 +5529,7 @@ msgid "Use builtin IPv6-management"
 msgstr "ビルトインのIPv6-マネジメントを使用する"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:33
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5496,7 +5558,7 @@ msgid "Use default gateway"
 msgstr "デフォルト ゲートウェイを使用する"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:87
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5536,11 +5598,11 @@ msgstr ""
 msgid "Used"
 msgstr "使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:781
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
 msgid "Used Key Slot"
 msgstr "使用するキースロット"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:842
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:868
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5560,11 +5622,11 @@ msgstr "ユーザー秘密鍵（PEM エンコード）"
 msgid "Username"
 msgstr "ユーザー名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:241
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
 msgid "VDSL"
 msgstr "VDSL"
 
@@ -5614,22 +5676,22 @@ msgstr "DHCPリクエスト送信時のベンダークラスを設定"
 msgid "Verify"
 msgstr "確認"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "仮想ダイナミックインターフェース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:458
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:459
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:541
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:564
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:543
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:655
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:657
 msgid "WEP Open System"
 msgstr "WEP オープンシステム"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:656
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:658
 msgid "WEP Shared Key"
 msgstr "WEP 共有キー"
 
@@ -5637,8 +5699,8 @@ msgstr "WEP 共有キー"
 msgid "WEP passphrase"
 msgstr "WEP 暗号フレーズ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:491
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:493
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
 msgid "WMM Mode"
 msgstr "WMM モード"
 
@@ -5646,9 +5708,9 @@ msgstr "WMM モード"
 msgid "WPA passphrase"
 msgstr "WPA 暗号フレーズ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:682
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:694
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:699
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:684
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:696
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:701
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5682,10 +5744,11 @@ msgstr "警告"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "警告: 再起動すると消えてしまう、保存されていない設定があります！"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:875
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:901
 msgid ""
-"When using a PSK, the PMK can be generated locally without inter AP "
-"communications"
+"When using a PSK, the PMK can be automatically generated. When enabled, the "
+"R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
+"key options."
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
@@ -5698,7 +5761,7 @@ msgstr "WireGuard VPN"
 
 #: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:447
+#: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "無線"
 
@@ -5711,36 +5774,36 @@ msgstr "無線アダプタ"
 msgid "Wireless Network"
 msgstr "無線ネットワーク"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:130
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
 msgid "Wireless Overview"
 msgstr "無線LANデバイス一覧"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:359
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
 msgid "Wireless Security"
 msgstr "無線LANセキュリティ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:97
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:102
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:60
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:160
 msgid "Wireless is disabled"
 msgstr "無線LAN機能は無効になっています"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:103
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:61
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:160
 msgid "Wireless is not associated"
 msgstr "無線LAN機能がアソシエーションされていません"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
 msgid "Wireless is restarting..."
 msgstr "無線LAN機能再起動中..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:124
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
 msgid "Wireless network is disabled"
 msgstr "無線LAN機能は無効になっています"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:128
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
 msgid "Wireless network is enabled"
 msgstr "無線LAN機能は有効になっています"
 
@@ -5769,7 +5832,7 @@ msgstr ""
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:206
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:221
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:253
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:243
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:253
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:298
 msgid ""
@@ -5806,14 +5869,14 @@ msgstr "ZRam サイズ"
 msgid "any"
 msgstr "全て"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:172
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:215
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:279
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:609
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:217
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:281
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:320
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:327
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:611
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
 #: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
@@ -5825,7 +5888,7 @@ msgstr "自動"
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:246
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
 msgid "bridged"
 msgstr "ブリッジ"
 
@@ -5843,17 +5906,18 @@ msgstr "作成:"
 msgid "creates a bridge over specified interface(s)"
 msgstr "指定したインターフェースでブリッジを作成します"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm:81
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:32
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:43
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:44
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5865,12 +5929,12 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:575
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:450
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
 msgid "disable"
 msgstr "無効"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:43
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
@@ -5903,11 +5967,11 @@ msgstr "全二重"
 msgid "half-duplex"
 msgstr "半二重"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:622
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:621
 msgid "hexadecimal encoded value"
 msgstr "エンコードされた値（16進数）"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:137
 msgid "hidden"
 msgstr "(不明)"
 
@@ -5925,16 +5989,16 @@ msgstr "ターゲットがネットワークの場合"
 msgid "input"
 msgstr "入力"
 
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:350
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:351
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:354
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:355
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:358
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:359
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:362
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:363
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:366
-#: modules/luci-mod-status/luasrc/view/admin_status/index.htm:367
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:192
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:193
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:196
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:197
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:200
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:201
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:204
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:205
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:208
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:209
 msgid "kB"
 msgstr "kB"
 
@@ -5958,11 +6022,11 @@ msgstr "kB/s"
 msgid "kbit/s"
 msgstr "kbit/s"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:460
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:459
 msgid "key between 8 and 63 characters"
 msgstr "8 文字以上 63 文字以下のキー"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:472
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:471
 msgid "key with either 5 or 13 characters"
 msgstr "5 文字または 13 文字のキー"
 
@@ -5970,15 +6034,15 @@ msgstr "5 文字または 13 文字のキー"
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:879
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:907
 msgid "minutes"
 msgstr "分"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
 msgid "mixed WPA/WPA2"
 msgstr "mixed WPA/WPA2"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:44
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
@@ -5988,7 +6052,7 @@ msgstr "いいえ"
 msgid "no link"
 msgstr "リンクなし"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:274
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:273
 msgid "non-empty value"
 msgstr "空ではない値"
 
@@ -6001,7 +6065,7 @@ msgstr ""
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:338
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:185
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:133
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:225
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:215
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:225
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:250
 msgid "off"
@@ -6009,13 +6073,13 @@ msgstr "オフ"
 
 #: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:184
 #: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:132
-#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:224
+#: themes/luci-theme-material/luasrc/view/themes/material/header.htm:214
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:224
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:247
 msgid "on"
 msgstr "オン"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:526
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:525
 msgid ""
 "one of:\n"
 " - %s"
@@ -6023,7 +6087,7 @@ msgstr ""
 "以下を満たす1つ:\n"
 " - %s"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:71
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
 msgid "open"
 msgstr "オープン"
 
@@ -6035,11 +6099,11 @@ msgstr "出力"
 msgid "overlay"
 msgstr "オーバーレイ"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:306
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:305
 msgid "positive decimal value"
 msgstr "正の値（10進数）"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:298
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:297
 msgid "positive integer value"
 msgstr "正の整数値"
 
@@ -6053,12 +6117,12 @@ msgstr "ランダム"
 msgid "relay mode"
 msgstr "リレー モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:247
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
 msgid "routed"
 msgstr "routed"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:522
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:515
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:524
 msgid "sec"
 msgstr "秒"
 
@@ -6083,15 +6147,15 @@ msgstr "ステートレス + ステートフル"
 msgid "tagged"
 msgstr "tagged"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:861
+#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:887
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:612
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:611
 msgid "unique value"
 msgstr "ユニークな値"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
 msgid "unknown"
 msgstr "不明"
 
@@ -6114,163 +6178,163 @@ msgstr "設定しない -又は- 作成:"
 msgid "untagged"
 msgstr "untagged"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:311
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:310
 msgid "valid IP address"
 msgstr "有効な IP アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:311
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:310
 msgid "valid IP address or prefix"
 msgstr "有効な IP アドレスまたはプレフィクス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:346
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:345
 msgid "valid IPv4 CIDR"
 msgstr "有効な IPv4 CIDR"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:319
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:318
 msgid "valid IPv4 address"
 msgstr "有効な IPv4 アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:319
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:318
 msgid "valid IPv4 address or network"
 msgstr "有効な IPv4 アドレスまたはネットワーク"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:439
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:438
 msgid "valid IPv4 address:port"
 msgstr "有効な IPv4 アドレス:ポート"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:379
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:378
 msgid "valid IPv4 network"
 msgstr "有効な IPv4 ネットワーク"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:341
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:340
 msgid "valid IPv4 or IPv6 CIDR"
 msgstr "有効な IPv4 または IPv6 CIDR"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:332
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:331
 msgid "valid IPv4 prefix value (0-32)"
 msgstr "有効な IPv4 プレフィクス値 (0 - 32)"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:351
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:350
 msgid "valid IPv6 CIDR"
 msgstr "有効な IPv6 CIDR"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:327
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:326
 msgid "valid IPv6 address"
 msgstr "有効な IPv6 アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:327
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:326
 msgid "valid IPv6 address or prefix"
 msgstr "有効な IPv6 アドレスまたはプレフィクス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:369
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:368
 msgid "valid IPv6 host id"
 msgstr "有効な IPv6 ホスト ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:384
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:383
 msgid "valid IPv6 network"
 msgstr "有効な IPv6 ネットワーク"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:337
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:336
 msgid "valid IPv6 prefix value (0-128)"
 msgstr "有効な IPv6 プレフィクス値 (0 - 128)"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:405
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:404
 msgid "valid MAC address"
 msgstr "有効な MAC アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:476
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:475
 msgid "valid UCI identifier"
 msgstr "有効な UCI 識別子"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:427
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:426
 msgid "valid UCI identifier, hostname or IP address"
 msgstr "有効な UCI 識別子またはホスト名、 IP アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:448
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:451
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:447
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:450
 msgid "valid address:port"
 msgstr "有効なアドレス:ポート"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:586
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:590
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:585
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:589
 msgid "valid date (YYYY-MM-DD)"
 msgstr "有効な日付 (YYYY-MM-DD)"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:302
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:301
 msgid "valid decimal value"
 msgstr "有効な10進数の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:470
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:469
 msgid "valid hexadecimal WEP key"
 msgstr "有効な WEP キー（16進数）"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:458
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:457
 msgid "valid hexadecimal WPA key"
 msgstr "有効な WPA キー（16進数）"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:433
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:432
 msgid "valid host:port"
 msgstr "有効なホスト:ポート"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:420
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:422
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:419
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:421
 msgid "valid hostname"
 msgstr "有効なホスト名"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:410
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:409
 msgid "valid hostname or IP address"
 msgstr "有効なホスト名または IP アドレス"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:294
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:293
 msgid "valid integer value"
 msgstr "有効な整数値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:374
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:373
 msgid "valid network in address/netmask notation"
 msgstr "有効なネットワーク（アドレス/ネットマスク 表記）"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:561
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:560
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:397
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:400
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:396
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:399
 msgid "valid port or port range (port1-port2)"
 msgstr "有効なポートまたはポート範囲（port1-port2)"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:389
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:388
 msgid "valid port value"
 msgstr "有効なポート番号"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:566
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:565
 msgid "valid time (HH:MM:SS)"
 msgstr "有効な時刻 (HH:MM:SS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:495
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:494
 msgid "value between %d and %d characters"
 msgstr "%d 以上 %d 文字以下の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:481
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:480
 msgid "value between %f and %f"
 msgstr "%f 以上 %f 以下の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:485
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:484
 msgid "value greater or equal to %f"
 msgstr "%f 以上の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:489
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:488
 msgid "value smaller or equal to %f"
 msgstr "%f 以下の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:500
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:499
 msgid "value with at least %d characters"
 msgstr " %d 文字以上の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/cbi.js:505
+#: modules/luci-base/htdocs/luci-static/resources/cbi.js:504
 msgid "value with at most %d characters"
 msgstr "%d 文字以下の値"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm:44
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "yes"
@@ -6279,33 +6343,3 @@ msgstr "はい"
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:20
 msgid "« Back"
 msgstr "« 戻る"
-
-#~ msgid "Apply unchecked"
-#~ 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 ""
-#~ "Here you can paste public SSH-Keys (one per line) for SSH public-key "
-#~ "authentication."
-#~ msgstr "SSH公開鍵認証で使用するSSH公開鍵を1行づつペーストしてください。"
-
-#~ msgid "Password successfully changed!"
-#~ msgstr "パスワードを変更しました！"
-
-#~ msgid "Unknown Error, password not changed!"
-#~ msgstr "不明なエラーです。パスワードは変更されていません！"