po: resync with source code

10 files changed, 396 insertions, 108 deletions

diff --git a/po/ja/base.po b/po/ja/base.po
index d07336522b..f29c44035a 100644
--- a/po/ja/base.po
+++ b/po/ja/base.po
@@ -40,12 +40,6 @@ msgstr "過去1分の負荷:"
 msgid "15 Minute Load:"
 msgstr "過去15分の負荷:"
 
-msgid "40MHz 2nd channel above"
-msgstr "40MHz 上側第2チャネル"
-
-msgid "40MHz 2nd channel below"
-msgstr "40MHz 下側第2チャネル"
-
 msgid "5 Minute Load:"
 msgstr "過去5分の負荷:"
 
@@ -87,6 +81,9 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-ゲートウェイ"
 
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
@@ -116,6 +113,12 @@ msgstr "<abbr title=\"maximal\">最大</abbr> 並列処理クエリ"
 msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
 msgstr ""
 
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
 msgid "APN"
 msgstr "APN"
 
@@ -143,9 +146,6 @@ msgstr ""
 msgid "ATM device number"
 msgstr "ATMデバイス番号"
 
-msgid "Accept router advertisements"
-msgstr "ルーター広告の受信を許可する"
-
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
@@ -181,6 +181,9 @@ msgstr "アクティブなDHCPv6リース"
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
+msgid "Ad-hoc mode"
+msgstr ""
+
 msgid "Add"
 msgstr "追加"
 
@@ -205,12 +208,6 @@ msgstr "管理画面"
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-msgid "Advertise IPv6 on network"
-msgstr "ネットワーク上のにIPv6 アドレスを広告する"
-
-msgid "Advertised network ID"
-msgstr "ネットワークIDを広告する"
-
 msgid "Alert"
 msgstr "警告"
 
@@ -240,17 +237,28 @@ msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-msgid "Allowed range is 1 to 65535"
-msgstr "設定可能な範囲は1から65535です"
+msgid "Always announce default router"
+msgstr ""
 
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
-msgstr "第2チャネルが重複しても、常に40MHz帯域幅を使用します。ただし本オプションはIEEE 802.11n-2009を満たしていません!"
+msgstr ""
+"第2チャネルが重複しても、常に40MHz帯域幅を使用します。ただし本オプションは"
+"IEEE 802.11n-2009を満たしていません!"
 
 msgid "An additional network will be created if you leave this unchecked."
 msgstr "チェックボックスがオフの場合、追加のネットワークが作成されます。"
 
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
 msgid "Antenna 1"
 msgstr "アンテナ 1"
 
@@ -269,9 +277,17 @@ msgstr "適用"
 msgid "Applying changes"
 msgstr "変更を適用"
 
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
 msgid "Assign interfaces..."
 msgstr ""
 
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
 msgid "Associated Stations"
 msgstr "認証済み端末"
 
@@ -290,6 +306,9 @@ msgstr "ログイン認証"
 msgid "Auto Refresh"
 msgstr "自動更新"
 
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
 msgid "Available"
 msgstr "使用可"
 
@@ -332,6 +351,9 @@ msgstr "バックアップ・ファイルリスト"
 msgid "Bad address specified!"
 msgstr "無効なアドレスです!"
 
+msgid "Band"
+msgstr ""
+
 msgid ""
 "Below is the determined list of files to backup. It consists of changed "
 "configuration files marked by opkg, essential base files and the user "
@@ -520,6 +542,9 @@ msgstr "Cronのログ出力レベル"
 msgid "Custom Interface"
 msgstr "新しいインターフェース"
 
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -545,12 +570,27 @@ msgstr "DHCPオプション"
 msgid "DHCPv6 Leases"
 msgstr "DHCPv6 リース"
 
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
 msgid "DNS"
 msgstr "DNS"
 
 msgid "DNS forwardings"
 msgstr "DNSフォワーディング"
 
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
 msgid "DUID"
 msgstr "DUID"
 
@@ -695,6 +735,9 @@ msgstr ""
 "クセスと統合された <abbr title=\"Secure Copy\">SCP</abbr> サーバーを提供しま"
 "す。"
 
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "ダイナミック <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
@@ -875,7 +918,8 @@ msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) を使用"
 
 msgid "Force DHCP on this network even if another server is detected."
-msgstr "別のDHCPサーバーが検出された場合でも、DHCPサーバー機能を強制的に起動します。"
+msgstr ""
+"別のDHCPサーバーが検出された場合でも、DHCPサーバー機能を強制的に起動します。"
 
 msgid "Force TKIP"
 msgstr "TKIP を使用"
@@ -934,23 +978,26 @@ msgstr "802.11%s 無線LANコントローラ"
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "入力されたパスワードが一致しません。パスワードは変更されませんでした!"
 
+msgid "Global network options"
+msgstr ""
+
 msgid "Go to password configuration..."
 msgstr "パスワード設定へ移動..."
 
 msgid "Go to relevant configuration page"
 msgstr "関連する設定ページへ移動"
 
+msgid "Guest mode"
+msgstr ""
+
 msgid "HE.net password"
 msgstr "HE.net パスワード"
 
 msgid "HE.net user ID"
 msgstr "HE.net ユーザーID"
 
-msgid "HT capabilities"
-msgstr "HT機能"
-
-msgid "HT mode"
-msgstr "HTモード"
+msgid "HT mode (802.11n)"
+msgstr ""
 
 msgid "Handler"
 msgstr "ハンドラ"
@@ -1012,6 +1059,9 @@ msgstr "IPv4 アドレス"
 msgid "IPv4 and IPv6"
 msgstr "IPv4及びIPv6"
 
+msgid "IPv4 assignment length"
+msgstr ""
+
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
@@ -1036,12 +1086,24 @@ msgstr "IPv6"
 msgid "IPv6 Firewall"
 msgstr "IPv6 ファイアウォール"
 
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
 msgid "IPv6 WAN Status"
 msgstr "IPv6 WAN ステータス"
 
 msgid "IPv6 address"
 msgstr "IPv6 アドレス"
 
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
 msgid "IPv6 gateway"
 msgstr "IPv6 ゲートウェイ"
 
@@ -1054,6 +1116,9 @@ msgstr "IPv6 プレフィクス"
 msgid "IPv6 prefix length"
 msgstr "IPv6 プレフィクス長"
 
+msgid "IPv6 routed prefix"
+msgstr ""
+
 msgid "IPv6-Address"
 msgstr "IPv6-アドレス"
 
@@ -1132,6 +1197,9 @@ msgstr "起動スクリプト"
 msgid "Install"
 msgstr "インストール"
 
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
 msgid "Install package %q"
 msgstr "%q パッケージをインストールします"
 
@@ -1268,6 +1336,15 @@ msgstr "凡例:"
 msgid "Limit"
 msgstr "割り当て数"
 
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
 msgid "Link On"
 msgstr "リンクオン"
 
@@ -1423,6 +1500,9 @@ msgstr "プロトコル %qのプロトコル拡張が見つかりません"
 msgid "Mode"
 msgstr "モード"
 
+msgid "Model"
+msgstr ""
+
 msgid "Modem device"
 msgstr "モデムデバイス"
 
@@ -1478,6 +1558,9 @@ msgstr "マルチキャストアドレス"
 msgid "NAS ID"
 msgstr "NAS ID"
 
+msgid "NDP-Proxy"
+msgstr ""
+
 msgid "NTP server candidates"
 msgstr "NTPサーバー候補"
 
@@ -1547,6 +1630,9 @@ msgstr "ゾーンが設定されていません"
 msgid "Noise"
 msgstr "ノイズ"
 
+msgid "Noise Margin"
+msgstr ""
+
 msgid "Noise:"
 msgstr "ノイズ:"
 
@@ -1810,6 +1896,9 @@ msgstr "新しいネットワークを設定する"
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "擬似アドホック (ahdemo)"
 
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
 msgid "Quality"
 msgstr "クオリティ"
 
@@ -1962,6 +2051,12 @@ msgstr "エントリーの置換"
 msgid "Replace wireless configuration"
 msgstr "無線設定を置換する"
 
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "DOCSIS 3.0を使用するいくつかのISPでは必要になります"
 
@@ -2001,11 +2096,8 @@ msgstr "ルート"
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP経由でファイルを取り扱う際のルートディレクトリ"
 
-msgid "Router Model"
-msgstr "ルーターモデル"
-
-msgid "Router Name"
-msgstr "ルーター名"
+msgid "Router Advertisement-Service"
+msgstr ""
 
 msgid "Router Password"
 msgstr "ルーター・パスワード"
@@ -2069,9 +2161,6 @@ msgstr ""
 "設定された秒間隔でLCP echoリクエストを送信します。失敗数しきい値を設定した場"
 "合のみ、機能が有効になります。"
 
-msgid "Send router solicitations"
-msgstr "ルータ要請を送信する"
-
 msgid "Separate Clients"
 msgstr "クライアントの分離"
 
@@ -2153,12 +2242,6 @@ msgstr "ソート"
 msgid "Source"
 msgstr "送信元"
 
-msgid "Specifies the advertised preferred prefix lifetime in seconds"
-msgstr "通知する推奨有効時間を設定してください。(秒単位)"
-
-msgid "Specifies the advertised valid prefix lifetime in seconds"
-msgstr "通知する最終有効時間を設定してください。(秒単位)"
-
 msgid "Specifies the button state to handle"
 msgstr ""
 
@@ -2229,6 +2312,9 @@ msgstr "問い合わせの制限"
 msgid "Submit"
 msgstr "送信"
 
+msgid "Swap"
+msgstr ""
+
 msgid "Swap Entry"
 msgstr "スワップ機能"
 
@@ -2357,7 +2443,9 @@ msgstr "設定されたネットワーク名はユニークなものではあり
 msgid ""
 "The hardware is not multi-SSID capable and existing configuration will be "
 "replaced if you proceed."
-msgstr "このハードウェアではマルチESSIDを設定することができないため、続行した場合、設定は既存の設定と置き換えられます。"
+msgstr ""
+"このハードウェアではマルチESSIDを設定することができないため、続行した場合、設"
+"定は既存の設定と置き換えられます。"
 
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
@@ -2467,6 +2555,10 @@ msgstr ""
 "ローカルネットワーク内のみの <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>として使用する"
 
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "スケジュールタスクシステムを使用することで、定期的に特定のタスクの実行を行う"
@@ -2544,6 +2636,9 @@ msgstr "トンネル ID"
 msgid "Tunnel Interface"
 msgstr "トンネルインターフェース"
 
+msgid "Tunnel Link"
+msgstr ""
+
 msgid "Turbo Mode"
 msgstr "ターボモード"
 
@@ -2594,8 +2689,10 @@ msgid ""
 "Check \"Keep settings\" to retain the current configuration (requires an "
 "OpenWrt compatible firmware image)."
 msgstr ""
-"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェアイメージをアップロードしてください。\"設定の保持\"を有効にすると、現"
-"在の設定を維持してアップデートを行います。ただし、OpenWrt互換のファームウェアイメージがアップロードされた場合のみ、設定は保持されます。"
+"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェアイ"
+"メージをアップロードしてください。\"設定の保持\"を有効にすると、現在の設定を"
+"維持してアップデートを行います。ただし、OpenWrt互換のファームウェアイメージが"
+"アップロードされた場合のみ、設定は保持されます。"
 
 msgid "Upload archive..."
 msgstr "アーカイブをアップロード"
@@ -2630,6 +2727,9 @@ msgstr "ルート・ファイルシステムとして使用する"
 msgid "Use broadcast flag"
 msgstr "ブロードキャスト・フラグを使用する"
 
+msgid "Use builtin IPv6-management"
+msgstr ""
+
 msgid "Use custom DNS servers"
 msgstr "DNSサーバーを手動で設定"
 
@@ -2639,9 +2739,6 @@ msgstr "デフォルトゲートウェイを使用する"
 msgid "Use gateway metric"
 msgstr "ゲートウェイ・メトリックを使用する"
 
-msgid "Use preferred lifetime"
-msgstr "推奨有効時間"
-
 msgid "Use routing table"
 msgstr ""
 
@@ -2656,9 +2753,6 @@ msgstr ""
 "ドレスを設定します。また、<em>ホスト名</em> はそのホストに対して一時的なホス"
 "ト名をアサインします。"
 
-msgid "Use valid lifetime"
-msgstr "最終有効時間"
-
 msgid "Used"
 msgstr "使用"
 
@@ -2792,6 +2886,10 @@ msgstr "全て"
 msgid "auto"
 msgstr "自動"
 
+#, fuzzy
+msgid "automatic"
+msgstr "static"
+
 msgid "baseT"
 msgstr "baseT"
 
@@ -2813,6 +2911,9 @@ msgstr "dBm"
 msgid "disable"
 msgstr "無効"
 
+msgid "disabled"
+msgstr ""
+
 msgid "expired"
 msgstr "期限切れ"
 
@@ -2838,6 +2939,9 @@ msgstr "ヘルプ"
 msgid "hidden"
 msgstr ""
 
+msgid "hybrid mode"
+msgstr ""
+
 msgid "if target is a network"
 msgstr "ターゲットがネットワークの場合"
 
@@ -2874,9 +2978,24 @@ msgstr "オン"
 msgid "open"
 msgstr ""
 
+msgid "relay mode"
+msgstr ""
+
 msgid "routed"
 msgstr "routed"
 
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
 msgid "tagged"
 msgstr "tagged"
 
@@ -2901,6 +3020,51 @@ msgstr "はい"
 msgid "« Back"
 msgstr "« 戻る"
 
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 上側第2チャネル"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 下側第2チャネル"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "ルーター広告の受信を許可する"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "ネットワーク上のにIPv6 アドレスを広告する"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ネットワークIDを広告する"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "設定可能な範囲は1から65535です"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT機能"
+
+#~ msgid "HT mode"
+#~ msgstr "HTモード"
+
+#~ msgid "Router Model"
+#~ msgstr "ルーターモデル"
+
+#~ msgid "Router Name"
+#~ msgstr "ルーター名"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "ルータ要請を送信する"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "通知する推奨有効時間を設定してください。(秒単位)"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "通知する最終有効時間を設定してください。(秒単位)"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "推奨有効時間"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "最終有効時間"
+
 #~ msgid "Waiting for router..."
 #~ msgstr "ルーターに接続中..."
 
@@ -3784,10 +3948,6 @@ msgstr "« 戻る"
 #~ msgid "adds domain names to hostentries in the resolv file"
 #~ msgstr "リゾルバファイルのホストエントリにドメイン名を追加します"
 
-#, fuzzy
-#~ msgid "automatic"
-#~ msgstr "static"
-
 #~ msgid "automatically reconnect"
 #~ msgstr "自動再接続"
 
diff --git a/po/ja/ddns.po b/po/ja/ddns.po
index 0b12cd1f18..806001cf2b 100644
--- a/po/ja/ddns.po
+++ b/po/ja/ddns.po
@@ -35,9 +35,6 @@ msgstr ""
 msgid "Enable"
 msgstr "有効"
 
-msgid "Event interface"
-msgstr "イベントインターフェース"
-
 msgid "Force update every"
 msgstr "強制的にアップデートを行う間隔"
 
@@ -53,9 +50,6 @@ msgstr "インターフェース"
 msgid "Network"
 msgstr "ネットワーク"
 
-msgid "On which interface up should start the ddns script process."
-msgstr "どのインターフェースが起動した際にddnsスクリプトを開始するか設定してください。"
-
 msgid "Password"
 msgstr "パスワード"
 
@@ -87,3 +81,11 @@ msgstr "分"
 
 msgid "network"
 msgstr "ネットワーク"
+
+#~ msgid "Event interface"
+#~ msgstr "イベントインターフェース"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr ""
+#~ "どのインターフェースが起動した際にddnsスクリプトを開始するか設定してくださ"
+#~ "い。"
diff --git a/po/ja/firewall.po b/po/ja/firewall.po
index 0739c2f9ec..68da3052b5 100644
--- a/po/ja/firewall.po
+++ b/po/ja/firewall.po
@@ -512,6 +512,9 @@ msgstr "遮断"
 msgid "reject"
 msgstr "拒否"
 
+msgid "traffic"
+msgstr ""
+
 #~ msgid "Destination"
 #~ msgstr "宛先"
 
diff --git a/po/ja/freifunk.po b/po/ja/freifunk.po
index d69b1f1764..028a2ce2b1 100644
--- a/po/ja/freifunk.po
+++ b/po/ja/freifunk.po
@@ -87,6 +87,9 @@ msgstr ""
 msgid "Enable IPv6"
 msgstr ""
 
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
 msgid "Error"
 msgstr ""
 
@@ -329,6 +332,9 @@ msgstr ""
 msgid "Uptime"
 msgstr ""
 
+msgid "VAP"
+msgstr ""
+
 msgid "Verify downloaded images"
 msgstr ""
 
diff --git a/po/ja/olsr.po b/po/ja/olsr.po
index 3c36225ad3..e132b6457f 100644
--- a/po/ja/olsr.po
+++ b/po/ja/olsr.po
@@ -37,17 +37,28 @@ msgstr "通知するアップリンク"
 msgid "Announced network"
 msgstr "通知ネットワーク"
 
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
 msgid "Both values must use the dotted decimal notation."
 msgstr "どちらの値もドット付き十進数の形式で入力してください。"
 
 msgid "Broadcast address"
 msgstr "ブロードキャストアドレス"
 
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "設定"
 
-msgid "Device"
-msgstr "デバイス"
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
 
 msgid "Display"
 msgstr "ディスプレイ"
@@ -110,6 +121,15 @@ msgstr "一般設定"
 msgid "General settings"
 msgstr "一般設定"
 
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
 msgid "HNA"
 msgstr "HNA"
 
@@ -131,6 +151,12 @@ msgstr "Hello 送信間隔"
 msgid "Hello validity time"
 msgstr "Hello 有効時間"
 
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
 msgid "Hna4"
 msgstr "Hna4"
 
@@ -273,6 +299,14 @@ msgstr ""
 "ネットワーク・インターフェースの設定が変更されたかをチェックするポーリング間"
 "隔を秒単位で設定します。標準設定は\"2.5\"です。"
 
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
 msgid "Known OLSR routes"
 msgstr "OLSR ルーティング"
 
@@ -291,6 +325,11 @@ msgstr "LQ fisheye"
 msgid "LQ level"
 msgstr "LQ レベル"
 
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
 msgid "Last hop"
 msgstr "最終ホップ"
 
@@ -366,12 +405,9 @@ msgid "Main IP"
 msgstr "メインIP"
 
 msgid ""
-"Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
-"configured on port 2006 and accepts connections from \"127.0.0.1\"."
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
-"OLSRdが稼働中であること、\"txinfo\"プラグインがロードされていること、ポート"
-"2006番が設定されていること、\"127.0.0.1\"からの接続が許可されていることを確認"
-"してください。"
 
 msgid "Metric"
 msgstr "メトリック"
@@ -381,14 +417,10 @@ msgstr "モード"
 
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
-"and 1. It is only used when LQ-Level is greater than 0. Examples:<br /"
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
 ">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
-"経路のLQと設定値の乗算を行います。設定可能な値は0.01-1です。この設定はLQ レベ"
-"ルが0以上の場合のみ設定可能です。<br />例:192.168.0.1へのLQを半分にする場合: "
-"192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%減らす場"
-"合: default 0.8"
 
 msgid "NAT threshold"
 msgstr "NAT しきい値"
@@ -447,6 +479,9 @@ msgstr "OLSR ゲートウェイ"
 msgid "OLSR node"
 msgstr "OLSR ノード"
 
+msgid "Orange"
+msgstr ""
+
 msgid "Overview"
 msgstr "概要"
 
@@ -489,6 +524,9 @@ msgstr "ポート"
 msgid "Prefix"
 msgstr "プレフィックス"
 
+msgid "Red"
+msgstr ""
+
 msgid "Resolve"
 msgstr "名前解決"
 
@@ -517,6 +555,15 @@ msgstr ""
 "して変更しません。標準設定は0.0.0.0であり、プライマリ・インターフェースのIPを"
 "自動的に使用します。"
 
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
 msgid "SmartGW"
 msgstr "SmartGW"
 
@@ -545,6 +592,12 @@ msgstr "状態"
 msgid "Status"
 msgstr "ステータス"
 
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
 msgid "Success rate of packages received from the neighbour"
 msgstr "隣接ノードから受信したパケットの受信成功率"
 
@@ -607,8 +660,8 @@ msgid "Topology"
 msgstr "トポロジー"
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is \"16"
-"\"."
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
 msgstr ""
 "OLSRコントロールパケットにおける、IPヘッダのTOS (Type Of Service) 値を設定し"
 "ます。標準設定は\"16\"です。"
@@ -625,9 +678,18 @@ msgstr "NATを使用して上位ネットワークに接続する"
 msgid "Use hysteresis"
 msgstr "ヒステリシスを使用する"
 
+msgid "Validity Time"
+msgstr ""
+
 msgid "Version"
 msgstr "バージョン"
 
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
 msgid "WLAN"
 msgstr "WLAN"
 
@@ -668,3 +730,34 @@ msgstr ""
 
 msgid "Willingness"
 msgstr "Willingness"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+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\"."
+#~ msgstr ""
+#~ "OLSRdが稼働中であること、\"txinfo\"プラグインがロードされていること、ポー"
+#~ "ト2006番が設定されていること、\"127.0.0.1\"からの接続が許可されていること"
+#~ "を確認してください。"
+
+#~ msgid ""
+#~ "Multiply routes with the factor given here. Allowed values are between "
+#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
+#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
+#~ "all nodes on this interface by 20%: default 0.8"
+#~ msgstr ""
+#~ "経路のLQと設定値の乗算を行います。設定可能な値は0.01-1です。この設定はLQ "
+#~ "レベルが0以上の場合のみ設定可能です。<br />例:192.168.0.1へのLQを半分にす"
+#~ "る場合: 192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して"
+#~ "20%減らす場合: default 0.8"
diff --git a/po/ja/p910nd.po b/po/ja/p910nd.po
index 99dd93be34..42335cefaf 100644
--- a/po/ja/p910nd.po
+++ b/po/ja/p910nd.po
@@ -26,12 +26,18 @@ msgstr ""
 "まず初めに、USB(kmod-usb-printer)または、パラレルポート(kmod-lp)をサポートす"
 "るためのパッケージをインストールしてください。"
 
+msgid "Interface"
+msgstr ""
+
 msgid "Port"
 msgstr "ポート番号"
 
 msgid "Settings"
 msgstr "設定"
 
+msgid "Specifies the interface to listen on."
+msgstr ""
+
 msgid "TCP listener port."
 msgstr "TCP接続待ちポート"
 
diff --git a/po/ja/pbx.po b/po/ja/pbx.po
index 4b465e748a..76199f4191 100644
--- a/po/ja/pbx.po
+++ b/po/ja/pbx.po
@@ -30,6 +30,12 @@ msgstr ""
 msgid "Call Routing"
 msgstr ""
 
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
 msgid "Call-through Numbers"
 msgstr ""
 
@@ -38,7 +44,13 @@ msgstr ""
 
 msgid ""
 "Designate numbers that are allowed to call through this system and which "
-"user's privileges it will have."
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
 msgstr ""
 
 msgid "Dials numbers unmatched elsewhere"
@@ -69,6 +81,13 @@ msgid "Enabled"
 msgstr ""
 
 msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
 "Enter phone numbers that you want to decline calls from automatically. You "
 "should probably omit the country code and any leading zeroes, but please "
 "experiment to make sure you are blocking numbers from your desired area "
@@ -129,6 +148,9 @@ msgstr ""
 msgid "Google Voice/Talk Accounts"
 msgstr "Google Voice/Talk アカウント"
 
+msgid "Hang-up Delay"
+msgstr ""
+
 msgid ""
 "Here you must configure at least one SIP account, that you will use to "
 "register with this service. Use this account either in an Analog Telephony "
@@ -139,6 +161,13 @@ msgid ""
 msgstr ""
 
 msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
 "If setting Server/Registrar to %s or %s does not work for you, try setting "
 "it to %s or %s and entering this port number in a separate field that "
 "specifies the Server/Registrar port number. Beware that some devices have a "
@@ -230,10 +259,9 @@ msgstr "パスワード"
 msgid ""
 "Pick a random port number between 6500 and 9500 for the service to listen "
 "on. Do not pick the standard 5060, because it is often subject to brute-"
-"force attacks. When finished, (1) click \"Save and Apply\", and (2) click "
-"the \"Restart VoIP Service\" button above. Finally, (3) look in the \"SIP "
-"Device/Softphone Accounts\" section for updated Server and Port settings for "
-"your SIP Devices/Softphones."
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
 msgstr ""
 
 msgid "Port Setting for SIP Devices"
@@ -308,6 +336,12 @@ msgid "Specify numbers individually here. Press enter to add more numbers."
 msgstr ""
 
 msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
 "The number(s) specified above will be able to dial out with this user's "
 "providers. Invalid usernames, including users not enabled for outgoing "
 "calls, are dropped silently. Please verify that the entry was accepted."
@@ -419,9 +453,10 @@ msgstr "はい"
 
 msgid ""
 "You can enter your domain name, external IP address, or dynamic domain name "
-"here Please keep in mind that if your IP address is dynamic and it changes "
-"your configuration will become invalid. Hence, it's recommended to set up "
-"Dynamic DNS in this case."
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
 msgstr ""
 
 msgid "You can specify a real name to show up in the Caller ID here."
diff --git a/po/ja/qos.po b/po/ja/qos.po
index 4044abc815..857cf5b83b 100644
--- a/po/ja/qos.po
+++ b/po/ja/qos.po
@@ -22,12 +22,12 @@ msgstr "区分ルール"
 msgid "Classification group"
 msgstr "区分グループ"
 
+msgid "Comment"
+msgstr ""
+
 msgid "Destination host"
 msgstr "宛先ホスト"
 
-msgid "Downlink"
-msgstr ""
-
 msgid "Download speed (kbit/s)"
 msgstr "ダウンロード速度 (kbit/s)"
 
@@ -40,9 +40,6 @@ msgstr "半二重"
 msgid "Interfaces"
 msgstr "インターフェース"
 
-msgid "Internet Connection"
-msgstr ""
-
 msgid "Number of bytes"
 msgstr "バイト数"
 
@@ -67,9 +64,6 @@ msgstr "送信元ホスト"
 msgid "Target"
 msgstr "対象"
 
-msgid "Uplink"
-msgstr ""
-
 msgid "Upload speed (kbit/s)"
 msgstr "アップロード速度 (kbit/s)"
 
@@ -83,9 +77,6 @@ msgstr ""
 msgid "all"
 msgstr "全て"
 
-msgid "allf"
-msgstr ""
-
 msgid "default"
 msgstr "標準"
 
@@ -100,6 +91,3 @@ msgstr "標準"
 
 msgid "priority"
 msgstr "最優先"
-
-msgid "qos_connbytes"
-msgstr ""
diff --git a/po/ja/splash.po b/po/ja/splash.po
index 07c6712179..615be16b23 100644
--- a/po/ja/splash.po
+++ b/po/ja/splash.po
@@ -108,11 +108,6 @@ msgstr ""
 msgid "Hostname"
 msgstr ""
 
-msgid ""
-"Hosts and Networks that are listed here are excluded from splashing, i.e. "
-"they are always allowed."
-msgstr ""
-
 msgid "IP Address"
 msgstr ""
 
diff --git a/po/ja/upnp.po b/po/ja/upnp.po
index ac0b3fa5f8..a563d3b266 100644
--- a/po/ja/upnp.po
+++ b/po/ja/upnp.po
@@ -126,13 +126,6 @@ msgid "UPNP"
 msgstr "UPnP"
 
 msgid ""
-"UPNP allows clients in the local network to automatically configure the "
-"router."
-msgstr ""
-"UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータを"
-"構成することができます。"
-
-msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
@@ -151,8 +144,15 @@ msgstr "アップリンク"
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
-msgid "enable"
-msgstr "有効"
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータ"
+#~ "を構成することができます。"
+
+#~ msgid "enable"
+#~ msgstr "有効"
 
 #~ msgid ""
 #~ "UPNP should only be enabled if absolutely necessary as it can result in "