i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

1 files changed, 198 insertions, 172 deletions

diff --git a/applications/luci-app-olsr/po/ja/olsr.po b/applications/luci-app-olsr/po/ja/olsr.po
index 97f220999..31de79d87 100644
--- a/applications/luci-app-olsr/po/ja/olsr.po
+++ b/applications/luci-app-olsr/po/ja/olsr.po
@@ -21,32 +21,34 @@ msgstr "アクティブなMID(Multi Interface Declaration) 通知"
 msgid "Active OLSR nodes"
 msgstr "アクティブなOLSRノード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "アクティブなホストネットワーク通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "NATを使用するゲートウェイを選択可能にする"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "NATを介してパケットを送信するIPv4 ゲートウェイを選択可能にします"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "通知するアップリンク"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "通知ネットワーク"
 
@@ -62,12 +64,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr "どちらの値もドット付き十進数の形式で入力してください。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "ブロードキャストアドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -86,11 +88,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "デバイス"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "ディスプレイ"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "ダウンリンク"
 
@@ -98,24 +105,25 @@ msgstr "ダウンリンク"
 msgid "Download Config"
 msgstr "設定ダウンロード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "有効"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -123,13 +131,13 @@ msgstr ""
 "スマートゲートウェイを有効にします。無効の場合、その他全てのスマートゲート"
 "ウェイの設定値は無視されます。標準設定は\"無効\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "このインターフェースを有効にします。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "有効"
 
@@ -137,13 +145,13 @@ msgstr "有効"
 msgid "Expected retransmission count"
 msgstr "再送数の期待値"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "FIB メトリック"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -159,26 +167,27 @@ msgstr ""
 "リック値として使用しますが、次ホップが変更した場合のみ更新を行います。標準設"
 "定は\"flat\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr "TCsのfisheyeメカニズムを使用します。標準設定は\"有効\"です。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "一般設定"
 
@@ -196,8 +205,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -206,17 +215,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "HNA 通知"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "HNA 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "HNA 有効時間"
 
@@ -225,22 +234,22 @@ msgstr "HNA 有効時間"
 msgid "HNA6 Announcements"
 msgstr "HNA 通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Hello 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Hello 有効時間"
 
@@ -258,16 +267,18 @@ msgstr ""
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "ホップ"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -283,8 +294,8 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -294,10 +305,10 @@ msgstr ""
 "効)。ヒステリシスはリンク検出に対するロバスト性を向上させますが、隣接ノードの"
 "登録が遅くなります。標準設定は\"有効\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IPアドレス"
 
@@ -309,17 +320,18 @@ msgstr ""
 "使用するIPプロトコルバージョンを指定します。6and4が選択された場合、各プロトコ"
 "ルに対して1つづつOLSRdインスタンスが起動します。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -329,13 +341,13 @@ msgstr ""
 "255.255.255.255が挙げられます。標準設定は\"0.0.0.0\"であり、インターフェース"
 "のブロードキャストIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 送信元"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -343,21 +355,22 @@ msgstr ""
 "送信するOLSRパケットのIPv4送信元アドレスです。標準設定は\"0.0.0.0\"であり、イ"
 "ンターフェースのIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 マルチキャスト"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -365,25 +378,25 @@ msgstr ""
 "IPv6 マルチキャストアドレスを設定します。標準はMANETルーターが使用するリンク"
 "ローカル・マルチキャストである\"FF02::6D\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "IPv6 ネットワークアドレスは省略せずに入力してください。プレフィクスはCIDR形式"
 "で入力してください。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 送信元"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -393,13 +406,13 @@ msgstr ""
 "フィクス値に一致するものを選択します。標準設定は\"0::/0\"であり、リンクローカ"
 "ルIPでないインターフェースIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "アップリンクIPv6 プレフィクス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -413,26 +426,28 @@ msgstr ""
 "<br /><b>警告:</b>このパラメータはetx_ffeth メトリックと同時に使用しないでく"
 "ださい!<br />標準設定は\"1.0\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 "このノードがNATを使用してインターネットに接続する場合、有効にしてください。標"
 "準設定は\"有効\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "インターフェース"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -443,15 +458,15 @@ msgstr ""
 "\"です。標準設定は\"mesh\"です。"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "インターフェース"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "インターフェース デフォルト設定"
 
@@ -459,8 +474,8 @@ msgstr "インターフェース デフォルト設定"
 msgid "Internet protocol"
 msgstr "インターネットプロトコル"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
@@ -468,23 +483,23 @@ msgstr ""
 "ネットワーク・インターフェースの設定が変更されたかをチェックするポーリング間"
 "隔を秒単位で設定します。標準設定は\"2.5\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "OLSR ルーティング"
 
@@ -492,30 +507,30 @@ msgstr "OLSR ルーティング"
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ エイジング"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ アルゴリズム"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ レベル"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -529,20 +544,20 @@ msgstr "最終ホップ"
 msgid "Legend"
 msgstr "凡例"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "ライブラリ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "リンク品質 (LQ) 設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -552,8 +567,8 @@ msgstr ""
 "効)。etx_float及びetx_fpmの値の調整を行います。値が小さくなると、ETX値の変化"
 "が遅くなります。設定可能な値は0.01-1.0です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -570,8 +585,8 @@ msgstr ""
 "す。イーサネットのリンクにETX 0.1を設定することができます<br />標準設定は"
 "\"etx_ff\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -582,10 +597,10 @@ msgstr ""
 "<br /><b>2</b> = MPR集合及びルーティングにリンク品質を加味する<br />標準設定"
 "は\"2\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "リンク品質 (LQ) マルチプリケーター"
 
@@ -597,36 +612,37 @@ msgstr "ノードあたりのリンク数 (平均)"
 msgid "Links total"
 msgstr "リンク数の合計"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "ローカルインターフェース IP"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "MID 有効時間"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "メインIP"
 
@@ -636,21 +652,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "メトリック"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "モード"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -672,8 +689,8 @@ msgstr ""
 "192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%減らす場"
 "合: default 0.8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "NAT しきい値"
 
@@ -685,7 +702,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "隣接ノード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "隣接ノード IP"
 
@@ -694,26 +712,26 @@ msgid "Neighbours"
 msgstr "隣接ノード"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "ネットマスク"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "ネットワーク"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "ネットワークアドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "NIC変更ポーリング間隔"
 
@@ -738,30 +756,32 @@ msgstr "OLSR - HNA (Host and Network Association) 通知"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA (Host and Network Association) 通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - プラグイン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR デーモン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR デーモン - インターフェース"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR コネクション"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR ゲートウェイ"
 
@@ -779,11 +799,11 @@ msgstr ""
 msgid "Overview"
 msgstr "概要"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "現在アクティブなOLSR HNA 一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "現在確立済のOLSR接続一覧"
 
@@ -791,7 +811,7 @@ msgstr "現在確立済のOLSR接続一覧"
 msgid "Overview of currently known OLSR nodes"
 msgstr "現在既知のOLSRノードの一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "現在のその他のOLSRノードへの経路一覧"
 
@@ -803,40 +823,41 @@ msgstr "OLSR稼働中のインターフェース一覧"
 msgid "Overview of known multiple interface announcements"
 msgstr "通知されているマルチ・インターフェースの一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "ネットワーク内のスマート・ゲートウェイ一覧"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "プラグイン設定"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "OLSRソケットのポーリング間隔を秒単位で設定します。標準は0.05です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "ポーリング間隔"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "ポート"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "プレフィックス"
 
@@ -868,7 +889,8 @@ msgstr "経路"
 msgid "Secondary OLSR interfaces"
 msgstr "セカンダリOLSR インターフェース"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -906,25 +928,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "SmartGW 通知"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "スマート・ゲートウェイ(SmartGW)は設定されていません。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "送信元アドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -932,12 +954,12 @@ msgstr ""
 "アップリンク速度をキロビット/秒で設定してください。1つ目のパラメータは上り、2"
 "つ目のパラメータは下りのストリームです。標準は\"128 1024\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "アップリンク速度"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "状態"
 
@@ -957,34 +979,34 @@ msgstr "隣接ノードから受信したパケットの受信成功率"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "隣接ノードへ送信したパケットの送信成功率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "TC 有効時間"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS値"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -998,8 +1020,8 @@ msgstr ""
 "ん全てのイーサネットデバイスでも使用可能です。<a href='http://www.olsr."
 "org'>olsrd.org</a>にアクセスして、ヘルプ及びドキュメントを参照してください。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -1007,13 +1029,13 @@ msgstr ""
 "willingnessを固定する場合に使用します。willingnessが設定されていない場合、"
 "バッテリや電源のステータスによって動的に計算されます。標準は\"3\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "OLSRdが使用するインターフェースです。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -1021,8 +1043,8 @@ msgstr ""
 "OLSRが使用するポート番号です。通常、このポート番号はIANAがアサインした698番で"
 "あるべきです。1-65535の間で設定可能です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1030,10 +1052,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "送信間隔及び有効時間"
 
@@ -1041,8 +1063,8 @@ msgstr "送信間隔及び有効時間"
 msgid "Topology"
 msgstr "トポロジー"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1054,21 +1076,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "OLSRデーモンに接続できません！"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "アップリンク"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "NATを使用して上位ネットワークに接続する"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "ヒステリシスを使用する"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1084,12 +1108,12 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1097,17 +1121,17 @@ msgstr ""
 "警告: kmod-ipipがインストールされていません。スマートゲートウェイはkmod-ipip"
 "なしでは動作しません。まず初めにインストールを行なってください。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Weight"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1145,8 +1169,8 @@ msgstr ""
 "ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
 "す。標準設定は、\"both\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -1155,40 +1179,42 @@ msgstr "Willingness"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "ステータス"
 
-#~ msgid "Device"
-#~ msgstr "デバイス"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."