sync with code

1 files changed, 533 insertions, 428 deletions

diff --git a/po/ja.po b/po/ja.po
index cca22d4..57f20d8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-ja\n"
-"POT-Creation-Date: 2009-04-02 13:30-0300\n"
+"POT-Creation-Date: 2009-08-17 17:15+0200\n"
 "PO-Revision-Date: 2009-03-22 21:05+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -29,19 +29,19 @@ msgid "Interface"
 msgstr "インターフェース"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:626
+#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP アドレス"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:456
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:463
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
@@ -82,15 +82,13 @@ msgid "Apply"
 msgstr "適用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:142 ../bin/draknetprofile.orig:142
-#: ../bin/net_monitor:388
+#: ../bin/draknetprofile:159 ../bin/net_monitor:388
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:144
-#: ../bin/draknetprofile.orig:144 ../bin/net_monitor:389
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -98,12 +96,12 @@ msgstr "OK"
 #: ../bin/drakconnect-old:113 ../bin/drakgw:351 ../bin/draknfs:584
 #: ../bin/draksambashare:229 ../lib/network/connection_manager.pm:74
 #: ../lib/network/connection_manager.pm:89
-#: ../lib/network/connection_manager.pm:203
-#: ../lib/network/connection_manager.pm:232
-#: ../lib/network/connection_manager.pm:348 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:142 ../lib/network/netconnect.pm:186
+#: ../lib/network/connection_manager.pm:206
+#: ../lib/network/connection_manager.pm:235
+#: ../lib/network/connection_manager.pm:351 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:143 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:726 ../lib/network/thirdparty.pm:354
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
@@ -144,7 +142,7 @@ msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
@@ -159,7 +157,7 @@ msgstr "起動プロトコル"
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:152
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP クライアント"
@@ -271,8 +269,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "インターネットに直接接続するネットワークインターフェースを選んでください。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:372
-#: ../lib/network/netconnect.pm:407
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
+#: ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
@@ -316,7 +314,7 @@ msgstr "内部ドメイン名"
 
 #: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149 ../bin/draknfs:93
+#: ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../bin/draknfs:93
 #: ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434
 #: ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612
 #: ../bin/draknfs:619 ../bin/draksambashare:393 ../bin/draksambashare:400
@@ -335,16 +333,16 @@ msgstr "内部ドメイン名"
 #: ../lib/network/connection_manager.pm:68
 #: ../lib/network/connection_manager.pm:84
 #: ../lib/network/connection_manager.pm:92
-#: ../lib/network/connection_manager.pm:174
-#: ../lib/network/connection_manager.pm:178
-#: ../lib/network/connection_manager.pm:220
-#: ../lib/network/connection_manager.pm:476
-#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:177
+#: ../lib/network/connection_manager.pm:181
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
 #: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
-#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847
 #: ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141
 #: ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:234
 #: ../lib/network/thirdparty.pm:255
@@ -560,7 +558,7 @@ msgstr "有効な IP アドレスを入力してください。"
 msgid "Same IP is already in %s file."
 msgstr "同じ IP が既に %s ファイルにあります。"
 
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:212
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
@@ -620,9 +618,9 @@ msgstr "削除"
 msgid "Failed to remove host."
 msgstr "ホストの削除に失敗しました。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:183
-#: ../bin/draknetprofile.orig:183 ../bin/net_applet:189
-#: ../lib/network/drakroam.pm:93 ../lib/network/netcenter.pm:169
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:205
+#: ../bin/net_applet:189 ../lib/network/drakroam.pm:93
+#: ../lib/network/netcenter.pm:171
 #, c-format
 msgid "Quit"
 msgstr "終了"
@@ -635,7 +633,7 @@ msgstr "許可するアドレス"
 #: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:132 ../bin/net_applet:292
-#: ../lib/network/drakfirewall.pm:300 ../lib/network/drakfirewall.pm:304
+#: ../lib/network/drakfirewall.pm:312 ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Interactive Firewall"
 msgstr "対話式ファイアウォール"
@@ -798,7 +796,7 @@ msgstr "仮想共有アドレス"
 msgid "Virtual ID"
 msgstr "仮想 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:608
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:615
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -824,78 +822,108 @@ msgstr "ネットワークインターフェースの同期"
 msgid "Connection mark bit"
 msgstr "接続マークビット"
 
-#: ../bin/draknetprofile:37 ../bin/draknetprofile.orig:37
+#: ../bin/draknetprofile:37
 #, c-format
 msgid "Network profiles"
 msgstr "ネットワークプロファイル"
 
-#: ../bin/draknetprofile:67 ../bin/draknetprofile.orig:67
+#: ../bin/draknetprofile:66
+#, fuzzy, c-format
+msgid "Module"
+msgstr "モード"
+
+#: ../bin/draknetprofile:67
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "有効にする"
+
+#: ../bin/draknetprofile:68
+#, c-format
+msgid "Description"
+msgstr "説明"
+
+#: ../bin/draknetprofile:84
 #, c-format
 msgid "Profile"
 msgstr "プロファイル"
 
-#: ../bin/draknetprofile:135 ../bin/draknetprofile.orig:135
+#: ../bin/draknetprofile:152
 #, c-format
 msgid "New profile..."
 msgstr "新規プロファイル..."
 
-#: ../bin/draknetprofile:138 ../bin/draknetprofile.orig:138
+#: ../bin/draknetprofile:155
 #, c-format
 msgid ""
-"Name of the profile to create (the new profile is created as a copy of the "
-"current one):"
+"Please specify the name of new network profile to create (e.g., work, home, "
+"roaming, ..). This new profile initially will be created with base on "
+"current settings, and you'll be able to configure your system configuration "
+"as usual afterwards."
 msgstr ""
-"作成するプロファイルの名前 (新しいプロファイルは現在のプロファイルのコピーと"
-"して作成します):"
 
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149
+#: ../bin/draknetprofile:166
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "プロファイル \"%s\" は既に存在します"
 
-#: ../bin/draknetprofile:165 ../bin/draknetprofile:167
-#: ../bin/draknetprofile.orig:165 ../bin/draknetprofile.orig:167
-#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:493
+#: ../bin/draknetprofile:172
+#, fuzzy, c-format
+msgid "New profile created"
+msgstr "新規プロファイル..."
+
+#: ../bin/draknetprofile:172
+#, c-format
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+
+#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
+#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../bin/draknetprofile:165 ../bin/draknetprofile.orig:165
-#, c-format
-msgid "You can not delete the default profile"
+#: ../bin/draknetprofile:183
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the default profile?"
 msgstr "デフォルトのプロファイルは削除できません"
 
-#: ../bin/draknetprofile:167 ../bin/draknetprofile.orig:167
-#, c-format
-msgid "You can not delete the current profile"
+#: ../bin/draknetprofile:186
+#, fuzzy, c-format
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
 msgstr "現在のプロファイルは削除できません"
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
+#: ../bin/draknetprofile:196
 #, c-format
-msgid ""
-"This tool allows to activate an existing network profile, and to manage "
-"(clone, delete) profiles."
+msgid "This tool allows to control network profiles."
 msgstr ""
-"このツールでは、既存のネットワークプロファイルの有効化と、プロファイルの管理 "
-"(複製や削除) を行います。"
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
-#, c-format
-msgid "To modify a profile, you have to activate it first."
-msgstr "プロファイルを編集するには、先にそれを有効にしなければなりません。"
+#: ../bin/draknetprofile:197
+#, fuzzy, c-format
+msgid "Select the netprofile modules:"
+msgstr "削除するネットワークインターフェースを選択:"
+
+#: ../bin/draknetprofile:199
+#, fuzzy, c-format
+msgid "Select a network profile:"
+msgstr "プロバイダを選択:"
 
-#: ../bin/draknetprofile:180 ../bin/draknetprofile.orig:180
+#: ../bin/draknetprofile:202
 #, c-format
 msgid "Activate"
 msgstr "有効にする"
 
-#: ../bin/draknetprofile:181 ../bin/draknetprofile.orig:181
+#: ../bin/draknetprofile:203
 #, c-format
-msgid "Clone"
-msgstr "複製する"
+msgid "New"
+msgstr ""
 
-#: ../bin/draknetprofile:182 ../bin/draknetprofile.orig:182
+#: ../bin/draknetprofile:204
 #, c-format
 msgid "Delete"
 msgstr "削除"
@@ -2209,7 +2237,7 @@ msgstr "アクティブなインターフェース"
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: ../bin/net_applet:180 ../lib/network/connection.pm:228
+#: ../bin/net_applet:180 ../lib/network/connection.pm:229
 #: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
 #: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, c-format
@@ -2412,67 +2440,72 @@ msgstr "インターネット接続が設定されていません"
 msgid "Unknown connection type"
 msgstr "未知の接続タイプ"
 
-#: ../lib/network/connection.pm:161
+#: ../lib/network/connection.pm:162
 #, c-format
 msgid "Network access settings"
 msgstr "ネットワークアクセスの設定"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:163
 #, c-format
 msgid "Access settings"
 msgstr "アクセスの設定"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:164
 #, c-format
 msgid "Address settings"
 msgstr "アドレスの設定"
 
-#: ../lib/network/connection.pm:177 ../lib/network/connection.pm:197
+#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
-#: ../lib/network/netconnect.pm:485 ../lib/network/netconnect.pm:581
-#: ../lib/network/netconnect.pm:584
+#: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
+#: ../lib/network/netconnect.pm:591
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "該当なし - 手動で編集"
 
-#: ../lib/network/connection.pm:230 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:48 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection.pm:231 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: ../lib/network/connection.pm:242
+#: ../lib/network/connection.pm:243
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "ユーザに接続の管理を許可しますか？"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:244
 #, c-format
 msgid "Start the connection at boot"
 msgstr "起動時に接続を開始"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:245
+#, fuzzy, c-format
+msgid "Account network traffic"
+msgstr "ネットワークインターフェースの同期"
+
+#: ../lib/network/connection.pm:246
 #, c-format
 msgid "Metric"
 msgstr "Metric"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "MTU"
 msgstr ""
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr ""
 
-#: ../lib/network/connection.pm:318
+#: ../lib/network/connection.pm:324
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "インターフェース %s にリンクを検出"
 
-#: ../lib/network/connection.pm:319 ../lib/network/connection/ethernet.pm:291
+#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "インターフェース %s でリンクビートが失われました"
@@ -2492,19 +2525,19 @@ msgstr "ケーブルモデム"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin を使う (Telstra に必要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:609
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "認証"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:348 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカウントのログイン (ユーザ名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:349 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
@@ -2615,12 +2648,12 @@ msgstr "手動設定"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP を自動設定 (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:125
+#: ../lib/network/connection/ethernet.pm:129
 #, c-format
 msgid "IP settings"
 msgstr "IP の設定"
 
-#: ../lib/network/connection/ethernet.pm:138
+#: ../lib/network/connection/ethernet.pm:142
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2631,119 +2664,135 @@ msgstr ""
 "それぞれの項目にはドット区切の形式で IP アドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:658
+#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:149
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:147
+#: ../lib/network/connection/ethernet.pm:151
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS サーバ 1"
 
-#: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS サーバ 2"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Search domain"
 msgstr "検索ドメイン"
 
-#: ../lib/network/connection/ethernet.pm:150
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP のタイムアウト (秒)"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:158
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:155
+#: ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:156
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ホスト名"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf (169.254.0.0 ネットワーク) にフォールバックしない"
 
-#: ../lib/network/connection/ethernet.pm:169
+#: ../lib/network/connection/ethernet.pm:173
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP アドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:174
+#: ../lib/network/connection/ethernet.pm:178
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:179
+#: ../lib/network/connection/ethernet.pm:183
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP アドレス %s は通常保留されています"
 
-#: ../lib/network/connection/ethernet.pm:185
-#, c-format
+#: ../lib/network/connection/ethernet.pm:192
+#, fuzzy, c-format
 msgid ""
-"%s is already used by connection that starts on boot. To use this address "
-"with this connection, first disable all other devices which use it, or "
-"configure them not to start on boot"
+"%s is already used by connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start on boot"
 msgstr ""
 "%s はシステムの起動時に開始する接続によって既に使われています。このアドレスを"
 "この接続に使うには、先にそれを使う他のすべてのデバイスを無効にするか、それら"
 "が起動時に開始しないように設定してください。"
 
-#: ../lib/network/connection/ethernet.pm:210
+#: ../lib/network/connection/ethernet.pm:219
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP アドレスからホスト名を割り当てる"
 
-#: ../lib/network/connection/ethernet.pm:230
+#: ../lib/network/connection/ethernet.pm:220
+#, c-format
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:223
+#, c-format
+msgid ""
+"You should define the hostname of this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections. If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:241
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: ../lib/network/connection/ethernet.pm:234
+#: ../lib/network/connection/ethernet.pm:245
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "IPv6 to IPv4 トンネルを有効にする"
 
-#: ../lib/network/connection/ethernet.pm:290
+#: ../lib/network/connection/ethernet.pm:301
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "インターフェース %s にリンクビートを検出"
 
-#: ../lib/network/connection/ethernet.pm:293
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを要求..."
 
-#: ../lib/network/connection/ethernet.pm:294
+#: ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを取得"
 
-#: ../lib/network/connection/ethernet.pm:295
+#: ../lib/network/connection/ethernet.pm:306
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -2755,22 +2804,22 @@ msgstr ""
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "I do not know"
 msgstr "不明"
 
-#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -2814,30 +2863,50 @@ msgstr "CHAP"
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: ../lib/network/connection/providers/cellular.pm:16
+#: ../lib/network/connection/providers/cellular.pm:15
+#: ../lib/network/connection/providers/xdsl.pm:191
+#: ../lib/network/connection/providers/xdsl.pm:201
+#: ../lib/network/connection/providers/xdsl.pm:210
+#: ../lib/network/connection/providers/xdsl.pm:219
+#, c-format
+msgid "Brazil"
+msgstr "ブラジル"
+
 #: ../lib/network/connection/providers/cellular.pm:20
-#: ../lib/network/connection/providers/cellular.pm:28
-#: ../lib/network/connection/providers/cellular.pm:34
-#: ../lib/network/connection/providers/cellular.pm:39
-#: ../lib/network/connection/providers/cellular.pm:45
-#: ../lib/network/connection/providers/cellular.pm:49
-#: ../lib/network/connection/providers/cellular.pm:53
-#: ../lib/network/connection/providers/cellular.pm:59
-#: ../lib/network/connection/providers/cellular.pm:63
+#: ../lib/network/connection/providers/cellular.pm:23
+#: ../lib/network/connection/providers/cellular.pm:26
+#: ../lib/network/connection/providers/cellular.pm:29
+#: ../lib/network/connection/providers/cellular.pm:32
+#: ../lib/network/connection/providers/cellular.pm:35
+#: ../lib/network/connection/providers/cellular.pm:38
+#, c-format
+msgid "Estonia"
+msgstr ""
+
+#: ../lib/network/connection/providers/cellular.pm:42
+#: ../lib/network/connection/providers/cellular.pm:46
+#: ../lib/network/connection/providers/cellular.pm:54
+#: ../lib/network/connection/providers/cellular.pm:60
+#: ../lib/network/connection/providers/cellular.pm:65
+#: ../lib/network/connection/providers/cellular.pm:71
+#: ../lib/network/connection/providers/cellular.pm:75
+#: ../lib/network/connection/providers/cellular.pm:79
+#: ../lib/network/connection/providers/cellular.pm:85
+#: ../lib/network/connection/providers/cellular.pm:89
 #: ../lib/network/connection/providers/xdsl.pm:483
 #, c-format
 msgid "Finland"
 msgstr "フィンランド"
 
-#: ../lib/network/connection/providers/cellular.pm:66
-#: ../lib/network/connection/providers/cellular.pm:69
-#: ../lib/network/connection/providers/cellular.pm:74
-#: ../lib/network/connection/providers/cellular.pm:79
-#: ../lib/network/connection/providers/cellular.pm:86
-#: ../lib/network/connection/providers/cellular.pm:91
-#: ../lib/network/connection/providers/cellular.pm:96
-#: ../lib/network/connection/providers/cellular.pm:99
-#: ../lib/network/connection/providers/cellular.pm:102
+#: ../lib/network/connection/providers/cellular.pm:92
+#: ../lib/network/connection/providers/cellular.pm:95
+#: ../lib/network/connection/providers/cellular.pm:100
+#: ../lib/network/connection/providers/cellular.pm:105
+#: ../lib/network/connection/providers/cellular.pm:112
+#: ../lib/network/connection/providers/cellular.pm:117
+#: ../lib/network/connection/providers/cellular.pm:122
+#: ../lib/network/connection/providers/cellular.pm:125
+#: ../lib/network/connection/providers/cellular.pm:128
 #: ../lib/network/connection/providers/xdsl.pm:492
 #: ../lib/network/connection/providers/xdsl.pm:504
 #: ../lib/network/connection/providers/xdsl.pm:516
@@ -2854,8 +2923,8 @@ msgstr "フィンランド"
 msgid "France"
 msgstr "フランス"
 
-#: ../lib/network/connection/providers/cellular.pm:105
-#: ../lib/network/connection/providers/cellular.pm:108
+#: ../lib/network/connection/providers/cellular.pm:131
+#: ../lib/network/connection/providers/cellular.pm:134
 #: ../lib/network/connection/providers/xdsl.pm:621
 #: ../lib/network/connection/providers/xdsl.pm:630
 #: ../lib/network/connection/providers/xdsl.pm:640
@@ -2863,10 +2932,10 @@ msgstr "フランス"
 msgid "Germany"
 msgstr "ドイツ"
 
-#: ../lib/network/connection/providers/cellular.pm:111
-#: ../lib/network/connection/providers/cellular.pm:116
-#: ../lib/network/connection/providers/cellular.pm:121
-#: ../lib/network/connection/providers/cellular.pm:126
+#: ../lib/network/connection/providers/cellular.pm:137
+#: ../lib/network/connection/providers/cellular.pm:142
+#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/cellular.pm:152
 #: ../lib/network/connection/providers/xdsl.pm:814
 #: ../lib/network/connection/providers/xdsl.pm:825
 #: ../lib/network/connection/providers/xdsl.pm:835
@@ -2876,17 +2945,17 @@ msgstr "ドイツ"
 msgid "Italy"
 msgstr "イタリア"
 
-#: ../lib/network/connection/providers/cellular.pm:131
-#: ../lib/network/connection/providers/cellular.pm:136
-#: ../lib/network/connection/providers/cellular.pm:141
-#: ../lib/network/connection/providers/cellular.pm:144
+#: ../lib/network/connection/providers/cellular.pm:157
+#: ../lib/network/connection/providers/cellular.pm:162
+#: ../lib/network/connection/providers/cellular.pm:167
+#: ../lib/network/connection/providers/cellular.pm:170
 #: ../lib/network/connection/providers/xdsl.pm:1001
 #: ../lib/network/connection/providers/xdsl.pm:1011
 #, c-format
 msgid "Poland"
 msgstr "ポーランド"
 
-#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/cellular.pm:173
 #: ../lib/network/connection/providers/xdsl.pm:1330
 #: ../lib/network/connection/providers/xdsl.pm:1340
 #: ../lib/network/netconnect.pm:38
@@ -2894,6 +2963,12 @@ msgstr "ポーランド"
 msgid "United Kingdom"
 msgstr "イギリス"
 
+#: ../lib/network/connection/providers/cellular.pm:178
+#: ../lib/network/netconnect.pm:37
+#, c-format
+msgid "United States"
+msgstr "アメリカ合衆国"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -2940,14 +3015,6 @@ msgstr "オーストラリア"
 msgid "Belgium"
 msgstr "ベルギー"
 
-#: ../lib/network/connection/providers/xdsl.pm:191
-#: ../lib/network/connection/providers/xdsl.pm:201
-#: ../lib/network/connection/providers/xdsl.pm:210
-#: ../lib/network/connection/providers/xdsl.pm:219
-#, c-format
-msgid "Brazil"
-msgstr "ブラジル"
-
 #: ../lib/network/connection/providers/xdsl.pm:228
 #: ../lib/network/connection/providers/xdsl.pm:237
 #, c-format
@@ -3160,47 +3227,47 @@ msgstr "トルコ"
 msgid "United Arab Emirates"
 msgstr "アラブ首長国連邦"
 
-#: ../lib/network/connection/wireless.pm:15
+#: ../lib/network/connection/wireless.pm:13
 #, c-format
 msgid "Wireless"
 msgstr "ワイヤレス"
 
-#: ../lib/network/connection/wireless.pm:16
+#: ../lib/network/connection/wireless.pm:14
 #, c-format
 msgid "Wireless (Wi-Fi)"
 msgstr "ワイヤレス (Wi-Fi)"
 
-#: ../lib/network/connection/wireless.pm:32
+#: ../lib/network/connection/wireless.pm:30
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Windows のドライバを使う (ndiswrapper と共に)"
 
-#: ../lib/network/connection/wireless.pm:49
+#: ../lib/network/connection/wireless.pm:47
 #, c-format
 msgid "Open WEP"
 msgstr "open モード WEP"
 
-#: ../lib/network/connection/wireless.pm:50
+#: ../lib/network/connection/wireless.pm:48
 #, c-format
 msgid "Restricted WEP"
 msgstr "restricted モード WEP"
 
-#: ../lib/network/connection/wireless.pm:51
+#: ../lib/network/connection/wireless.pm:49
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 事前共有鍵"
 
-#: ../lib/network/connection/wireless.pm:52
+#: ../lib/network/connection/wireless.pm:50
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:271
+#: ../lib/network/connection/wireless.pm:269
 #, c-format
 msgid "Windows driver"
 msgstr "Windows ドライバ"
 
-#: ../lib/network/connection/wireless.pm:357
+#: ../lib/network/connection/wireless.pm:355
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -3209,73 +3276,78 @@ msgstr ""
 "ワイヤレスカードが無効になっています。先にワイヤレススイッチ (RF Kill スイッ"
 "チ) を有効にしてください。"
 
-#: ../lib/network/connection/wireless.pm:444
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "Wireless settings"
 msgstr "ワイヤレスの設定"
 
-#: ../lib/network/connection/wireless.pm:449
-#: ../lib/network/connection_manager.pm:277
+#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Secondary"
 msgstr "セカンダリ"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:453
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:455
+#: ../lib/network/connection/wireless.pm:456
 #, c-format
 msgid "Encryption mode"
 msgstr "暗号化モード"
 
-#: ../lib/network/connection/wireless.pm:457
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "Encryption key"
 msgstr "暗号鍵"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:461
+#, fuzzy, c-format
+msgid "Hide password"
+msgstr "パスワード"
+
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "この鍵を強制的に ASCII 文字列として使う (例えば Livebox 用)"
 
-#: ../lib/network/connection/wireless.pm:466
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP ログイン/ユーザ名"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3283,12 +3355,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP Password"
 msgstr "EAP パスワード"
 
-#: ../lib/network/connection/wireless.pm:473
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3307,12 +3379,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:487
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP クライアント証明書"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3321,37 +3393,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:493
-#, fuzzy, c-format
-msgid "Wireless regulatory domain"
-msgstr "ワイヤレスネットワーク"
-
-#: ../lib/network/connection/wireless.pm:495
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid "Network ID"
 msgstr "ネットワーク ID"
 
-#: ../lib/network/connection/wireless.pm:496
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: ../lib/network/connection/wireless.pm:497
+#: ../lib/network/connection/wireless.pm:500
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: ../lib/network/connection/wireless.pm:498
+#: ../lib/network/connection/wireless.pm:501
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート (b/s)"
 
-#: ../lib/network/connection/wireless.pm:499
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:500
+#: ../lib/network/connection/wireless.pm:503
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -3371,17 +3438,17 @@ msgstr ""
 "のメカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータを auto/fixed/off に設定することもできます。"
 
-#: ../lib/network/connection/wireless.pm:507
+#: ../lib/network/connection/wireless.pm:510
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:511
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3397,12 +3464,12 @@ msgstr ""
 "詳しくは man iwconfig(8) を参照してください。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:519
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:520
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3421,12 +3488,12 @@ msgstr ""
 "\n"
 "詳しくは man iwspy(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:528
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:527
+#: ../lib/network/connection/wireless.pm:530
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -3450,28 +3517,28 @@ msgstr ""
 "明されています。\n"
 "詳しくは man iwpriv(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:538
+#: ../lib/network/connection/wireless.pm:541
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP プロトコル"
 
-#: ../lib/network/connection/wireless.pm:539
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -3480,79 +3547,79 @@ msgstr ""
 "自動検出は最初に WPA のバージョン 2 を試し、使えない場合は\n"
 "バージョン 1 にフォールバックするので、これをお勧めします。"
 
-#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/connection/wireless.pm:546
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP モード"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:546
+#: ../lib/network/connection/wireless.pm:549
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:548
+#: ../lib/network/connection/wireless.pm:551
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:550
+#: ../lib/network/connection/wireless.pm:553
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3560,12 +3627,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP フェーズ 2"
 
-#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:560
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3574,12 +3641,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 証明書"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3589,12 +3656,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:568
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:570
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3604,12 +3671,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:578
 #, c-format
-msgid "EAP extra directives"
+msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3627,26 +3694,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:597
+#: ../lib/network/connection/wireless.pm:599
 #, c-format
 msgid "An encryption key is required."
 msgstr "暗号鍵が必要です。"
 
-#: ../lib/network/connection/wireless.pm:604
+#: ../lib/network/connection/wireless.pm:606
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:612
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:619
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -3655,7 +3722,7 @@ msgstr ""
 "単位は k, M, G で入力してください (2.46 GHz の場合は 2.46G)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:623
+#: ../lib/network/connection/wireless.pm:625
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -3664,17 +3731,17 @@ msgstr ""
 "単位は k, M, G で入力してください (例: 11M)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:635
+#: ../lib/network/connection/wireless.pm:637
 #, c-format
 msgid "Allow access point roaming"
 msgstr "アクセスポイントローミングを許可"
 
-#: ../lib/network/connection/wireless.pm:756
+#: ../lib/network/connection/wireless.pm:762
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワーク \"%s\" に関連付けました"
 
-#: ../lib/network/connection/wireless.pm:757
+#: ../lib/network/connection/wireless.pm:763
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワークへの関連付けが失われました"
@@ -3684,7 +3751,7 @@ msgstr "インターフェース %s のワイヤレスネットワークへの�
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:782
+#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:789
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB モデム"
@@ -3775,160 +3842,165 @@ msgstr "ネットワークの設定"
 msgid "Please enter settings for network"
 msgstr "ネットワークの設定を入力してください"
 
-#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "接続..."
 
-#: ../lib/network/connection_manager.pm:220
-#: ../lib/network/connection_manager.pm:476
-#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: ../lib/network/connection_manager.pm:232
+#: ../lib/network/connection_manager.pm:235
 #, c-format
 msgid "Disconnecting..."
 msgstr "切断します..."
 
-#: ../lib/network/connection_manager.pm:274
+#: ../lib/network/connection_manager.pm:277
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:275
+#: ../lib/network/connection_manager.pm:278
 #, c-format
 msgid "Signal strength"
 msgstr "信号強度"
 
-#: ../lib/network/connection_manager.pm:276
+#: ../lib/network/connection_manager.pm:279
 #, c-format
 msgid "Encryption"
 msgstr "暗号化"
 
-#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "ネットワークをスキャンしています..."
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "接続"
 
-#: ../lib/network/connection_manager.pm:442
+#: ../lib/network/connection_manager.pm:445
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "ホスト名が \"%s\" に変わりました"
 
-#: ../lib/network/drakfirewall.pm:13
+#: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
 msgstr "Web サーバ"
 
-#: ../lib/network/drakfirewall.pm:18
+#: ../lib/network/drakfirewall.pm:19
 #, c-format
 msgid "Domain Name Server"
 msgstr "ドメイン名サーバ"
 
-#: ../lib/network/drakfirewall.pm:23
+#: ../lib/network/drakfirewall.pm:24
 #, c-format
 msgid "SSH server"
 msgstr "SSH サーバ"
 
-#: ../lib/network/drakfirewall.pm:28
+#: ../lib/network/drakfirewall.pm:29
 #, c-format
 msgid "FTP server"
 msgstr "FTP サーバ"
 
-#: ../lib/network/drakfirewall.pm:33
+#: ../lib/network/drakfirewall.pm:34
 #, fuzzy, c-format
 msgid "DHCP Server"
 msgstr "CUPS サーバ"
 
-#: ../lib/network/drakfirewall.pm:39
+#: ../lib/network/drakfirewall.pm:40
 #, c-format
 msgid "Mail Server"
 msgstr "メールサーバ"
 
-#: ../lib/network/drakfirewall.pm:44
+#: ../lib/network/drakfirewall.pm:45
 #, c-format
 msgid "POP and IMAP Server"
 msgstr "POP と IMAP サーバ"
 
-#: ../lib/network/drakfirewall.pm:49
+#: ../lib/network/drakfirewall.pm:50
 #, c-format
 msgid "Telnet server"
 msgstr "Telnet サーバ"
 
-#: ../lib/network/drakfirewall.pm:55
+#: ../lib/network/drakfirewall.pm:56
 #, fuzzy, c-format
 msgid "NFS Server"
 msgstr "/_NFS サーバ"
 
-#: ../lib/network/drakfirewall.pm:63
+#: ../lib/network/drakfirewall.pm:64
 #, c-format
 msgid "Windows Files Sharing (SMB)"
 msgstr "Windows ファイル共有 (SMB)"
 
-#: ../lib/network/drakfirewall.pm:69
+#: ../lib/network/drakfirewall.pm:70
 #, c-format
 msgid "Bacula backup"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:75
+#: ../lib/network/drakfirewall.pm:76
 #, fuzzy, c-format
 msgid "Syslog network logging"
 msgstr "Network Hotplugging"
 
-#: ../lib/network/drakfirewall.pm:81
+#: ../lib/network/drakfirewall.pm:82
 #, c-format
 msgid "CUPS server"
 msgstr "CUPS サーバ"
 
-#: ../lib/network/drakfirewall.pm:87
+#: ../lib/network/drakfirewall.pm:88
 #, fuzzy, c-format
 msgid "MySQL server"
 msgstr "NFS サーバ"
 
-#: ../lib/network/drakfirewall.pm:93
+#: ../lib/network/drakfirewall.pm:94
 #, fuzzy, c-format
 msgid "PostgreSQL server"
 msgstr "CUPS サーバ"
 
-#: ../lib/network/drakfirewall.pm:99
+#: ../lib/network/drakfirewall.pm:100
 #, c-format
 msgid "Echo request (ping)"
 msgstr "エコーリクエスト (ping)"
 
-#: ../lib/network/drakfirewall.pm:104
+#: ../lib/network/drakfirewall.pm:105
+#, c-format
+msgid "AVAHI and mDNS"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:111
 #, c-format
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: ../lib/network/drakfirewall.pm:110
+#: ../lib/network/drakfirewall.pm:117
 #, c-format
 msgid "Windows Mobile device synchronization"
 msgstr "Windows 携帯デバイスの同期"
 
-#: ../lib/network/drakfirewall.pm:119
+#: ../lib/network/drakfirewall.pm:126
 #, c-format
 msgid "Port scan detection"
 msgstr "ポートスキャンの検出"
 
-#: ../lib/network/drakfirewall.pm:214 ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:225 ../lib/network/drakfirewall.pm:231
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
 msgstr "ファイアウォールの設定"
 
-#: ../lib/network/drakfirewall.pm:214
+#: ../lib/network/drakfirewall.pm:225
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3943,7 +4015,7 @@ msgstr ""
 "強力なファイアウォール専用ソリューションをお求めの場合は\n"
 "Mandriva Security Firewall をご利用ください。"
 
-#: ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:231
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3956,13 +4028,13 @@ msgstr ""
 "先に進む前に drakconnect でネットワーク/インターネットアクセスが\n"
 "設定されていることを確認してください。"
 
-#: ../lib/network/drakfirewall.pm:237 ../lib/network/drakfirewall.pm:239
+#: ../lib/network/drakfirewall.pm:248 ../lib/network/drakfirewall.pm:250
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: ../lib/network/drakfirewall.pm:240
+#: ../lib/network/drakfirewall.pm:251
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -3973,7 +4045,7 @@ msgstr ""
 "正しい例: 139/tcp 139/udp 600:610/tcp 600:610/udp\n"
 "詳しくは /etc/services をご覧ください。"
 
-#: ../lib/network/drakfirewall.pm:246
+#: ../lib/network/drakfirewall.pm:257
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -3988,27 +4060,33 @@ msgstr ""
 "\n"
 "ポートを範囲で指定することもできます。(例: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:267
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "インターネットに接続を許可するサービスを選んでください。"
 
-#: ../lib/network/drakfirewall.pm:257
+#: ../lib/network/drakfirewall.pm:268 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:540
+#, c-format
+msgid "Those settings will be saved for the network profile <b>%s</b>"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "すべて (ファイアウォールなし)"
 
-#: ../lib/network/drakfirewall.pm:259
+#: ../lib/network/drakfirewall.pm:271
 #, c-format
 msgid "Other ports"
 msgstr "その他のポート"
 
-#: ../lib/network/drakfirewall.pm:260
+#: ../lib/network/drakfirewall.pm:272
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "システムログにファイアウォールのメッセージを記録する"
 
-#: ../lib/network/drakfirewall.pm:302
+#: ../lib/network/drakfirewall.pm:314
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4019,7 +4097,7 @@ msgstr ""
 "告を受けることができます。\n"
 "監視するネットワークアクティビティを選んでください。"
 
-#: ../lib/network/drakfirewall.pm:307
+#: ../lib/network/drakfirewall.pm:319
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "対話式ファイアウォールを使う"
@@ -4044,7 +4122,7 @@ msgstr "設定"
 msgid "Refresh"
 msgstr "更新"
 
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:788
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Wireless connection"
 msgstr "ワイヤレス接続"
@@ -4185,8 +4263,8 @@ msgid "port %d"
 msgstr "ポート %d"
 
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:625
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -4194,10 +4272,10 @@ msgstr "手動"
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
 #: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
 #: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:620
-#: ../lib/network/netconnect.pm:625 ../lib/network/netconnect.pm:637
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
-#: ../lib/network/netconnect.pm:660
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:632 ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
+#: ../lib/network/netconnect.pm:667
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -4208,9 +4286,17 @@ msgid "No device supporting the %s ndiswrapper driver is present!"
 msgstr "%s ndiswrapper ドライバをサポートするデバイスがありません"
 
 #: ../lib/network/ndiswrapper.pm:36
+#, fuzzy, c-format
+msgid "Please select the correct driver"
+msgstr "プロバイダを選んでください:"
+
+#: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver (.inf file)"
-msgstr "Windows のドライバ (.inf ファイル) を選んでください"
+msgid ""
+"Please select Windows driver description (.inf file), or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4268,23 +4354,23 @@ msgid ""
 "Monitor"
 msgstr "モニタ"
 
-#: ../lib/network/netcenter.pm:144
+#: ../lib/network/netcenter.pm:145
 #, c-format
 msgid "Network Center"
 msgstr "ネットワークセンター"
 
-#: ../lib/network/netcenter.pm:168
+#: ../lib/network/netcenter.pm:164
 #, c-format
-msgid "Advanced settings"
-msgstr "上級設定"
+msgid "You are currently using the network profile <b>%s</b>"
+msgstr ""
 
-#: ../lib/network/netconnect.pm:37
+#: ../lib/network/netcenter.pm:170
 #, c-format
-msgid "United States"
-msgstr "アメリカ合衆国"
+msgid "Advanced settings"
+msgstr "上級設定"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:515
-#: ../lib/network/netconnect.pm:529
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:522
+#: ../lib/network/netconnect.pm:536
 #, c-format
 msgid "Manual choice"
 msgstr "手動選択"
@@ -4323,8 +4409,8 @@ msgstr "ネットワークとインターネットの設定"
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:370
-#: ../lib/network/netconnect.pm:815
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:377
+#: ../lib/network/netconnect.pm:822
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "設定するネットワークインターフェースを選択:"
@@ -4358,114 +4444,114 @@ msgstr ""
 "接続プロトコルを選んでください。\n"
 "不明な場合はそのままにしておいてください。"
 
-#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:677
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:684
 #, c-format
 msgid "Connection control"
 msgstr "接続のコントロール"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:726
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしています..."
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "下記の項目を埋めるかチェックを入れてください"
 
-#: ../lib/network/netconnect.pm:340
+#: ../lib/network/netconnect.pm:347
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:348
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前 (例: provider.net)"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:349
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバイダの DNS 1 (オプション)"
 
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:351
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダの DNS 2 (オプション)"
 
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:352
 #, c-format
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: ../lib/network/netconnect.pm:346
+#: ../lib/network/netconnect.pm:353
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速度"
 
-#: ../lib/network/netconnect.pm:347
+#: ../lib/network/netconnect.pm:354
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト (秒)"
 
-#: ../lib/network/netconnect.pm:350
+#: ../lib/network/netconnect.pm:357
 #, c-format
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: ../lib/network/netconnect.pm:351
+#: ../lib/network/netconnect.pm:358
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: ../lib/network/netconnect.pm:352
+#: ../lib/network/netconnect.pm:359
 #, c-format
 msgid "Card IO"
 msgstr "カード IO"
 
-#: ../lib/network/netconnect.pm:353
+#: ../lib/network/netconnect.pm:360
 #, c-format
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: ../lib/network/netconnect.pm:354
+#: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: ../lib/network/netconnect.pm:373 ../lib/network/netconnect.pm:378
+#: ../lib/network/netconnect.pm:380 ../lib/network/netconnect.pm:385
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付 ISDN モデム"
 
-#: ../lib/network/netconnect.pm:406
+#: ../lib/network/netconnect.pm:413
 #, c-format
 msgid "Select a device!"
 msgstr "デバイスを選んでください"
 
-#: ../lib/network/netconnect.pm:415 ../lib/network/netconnect.pm:425
-#: ../lib/network/netconnect.pm:435 ../lib/network/netconnect.pm:468
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:422 ../lib/network/netconnect.pm:432
+#: ../lib/network/netconnect.pm:442 ../lib/network/netconnect.pm:475
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN の設定"
 
-#: ../lib/network/netconnect.pm:416
+#: ../lib/network/netconnect.pm:423
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お使いのカードの種類を指定してください"
 
-#: ../lib/network/netconnect.pm:426
+#: ../lib/network/netconnect.pm:433
 #, c-format
 msgid ""
 "\n"
@@ -4479,22 +4565,22 @@ msgstr ""
 "\n"
 "PCMCIA カードをお持ちの場合はカードの irq と io を調べる必要があります。\n"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/network/netconnect.pm:436
+#: ../lib/network/netconnect.pm:443
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お使いの ISDN カードを選んでください"
 
-#: ../lib/network/netconnect.pm:454
+#: ../lib/network/netconnect.pm:461
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4505,12 +4591,12 @@ msgstr ""
 "バより多くの機能 (例: FAX 送信) を備えています。どちらのドライバを使います"
 "か？"
 
-#: ../lib/network/netconnect.pm:468
+#: ../lib/network/netconnect.pm:475
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを使いますか？"
 
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -4519,12 +4605,12 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "リストにない場合は「該当なし」を選んでください。"
 
-#: ../lib/network/netconnect.pm:484 ../lib/network/netconnect.pm:580
+#: ../lib/network/netconnect.pm:491 ../lib/network/netconnect.pm:587
 #, c-format
 msgid "Provider:"
 msgstr "プロバイダ:"
 
-#: ../lib/network/netconnect.pm:493
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -4533,132 +4619,132 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: ../lib/network/netconnect.pm:512
+#: ../lib/network/netconnect.pm:519
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "設定するモデムを選択:"
 
-#: ../lib/network/netconnect.pm:514
+#: ../lib/network/netconnect.pm:521
 #, c-format
 msgid "Modem"
 msgstr "モデム"
 
-#: ../lib/network/netconnect.pm:549
+#: ../lib/network/netconnect.pm:556
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムが接続されているシリアルポートを選んでください。"
 
-#: ../lib/network/netconnect.pm:578
+#: ../lib/network/netconnect.pm:585
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバイダを選択:"
 
-#: ../lib/network/netconnect.pm:602
+#: ../lib/network/netconnect.pm:609
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダイアルアップ: アカウントのオプション"
 
-#: ../lib/network/netconnect.pm:605
+#: ../lib/network/netconnect.pm:612
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: ../lib/network/netconnect.pm:606
+#: ../lib/network/netconnect.pm:613
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: ../lib/network/netconnect.pm:607
+#: ../lib/network/netconnect.pm:614
 #, c-format
 msgid "Login ID"
 msgstr "ログイン ID"
 
-#: ../lib/network/netconnect.pm:622 ../lib/network/netconnect.pm:655
+#: ../lib/network/netconnect.pm:629 ../lib/network/netconnect.pm:662
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダイアルアップ: IP パラメータ"
 
-#: ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:632
 #, c-format
 msgid "IP parameters"
 msgstr "IP パラメータ"
 
-#: ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: ../lib/network/netconnect.pm:639
+#: ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダイアルアップ: DNS パラメータ"
 
-#: ../lib/network/netconnect.pm:642
+#: ../lib/network/netconnect.pm:649
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:643
+#: ../lib/network/netconnect.pm:650
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:651
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "プライマリ DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:645
+#: ../lib/network/netconnect.pm:652
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンド DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IP からホスト名を設定"
 
-#: ../lib/network/netconnect.pm:659
+#: ../lib/network/netconnect.pm:666
 #, c-format
 msgid "Gateway IP address"
 msgstr "ゲートウェイ IP アドレス"
 
-#: ../lib/network/netconnect.pm:692
+#: ../lib/network/netconnect.pm:699
 #, c-format
 msgid "Automatically at boot"
 msgstr "起動時に自動的に開始"
 
-#: ../lib/network/netconnect.pm:694
+#: ../lib/network/netconnect.pm:701
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "システムトレイの Net アプレットを使う"
 
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:703
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動 (インターフェースは起動時に自動的に始動します)"
 
-#: ../lib/network/netconnect.pm:705
+#: ../lib/network/netconnect.pm:712
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "この接続にどのようにダイアルしますか？"
 
-#: ../lib/network/netconnect.pm:718
+#: ../lib/network/netconnect.pm:725
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "すぐにインターネットに接続しますか？"
 
-#: ../lib/network/netconnect.pm:745
+#: ../lib/network/netconnect.pm:752
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "インターネットに接続しました。"
 
-#: ../lib/network/netconnect.pm:746
+#: ../lib/network/netconnect.pm:753
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: ../lib/network/netconnect.pm:747
+#: ../lib/network/netconnect.pm:754
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -4667,7 +4753,7 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/netconnect.pm:770
 #, fuzzy, c-format
 msgid "Problems occured during the network connectivity test."
 msgstr ""
@@ -4675,21 +4761,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:764
+#: ../lib/network/netconnect.pm:771
 #, c-format
 msgid ""
 "This can be caused by invalid network configuration, or problems with your "
 "modem or router."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:765
+#: ../lib/network/netconnect.pm:772
 #, c-format
 msgid ""
 "You might want to relaunch the configuration to verify the connection "
 "settings."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, fuzzy, c-format
 msgid "Congratulations, the network configuration is finished."
 msgstr ""
@@ -4697,14 +4783,14 @@ msgstr ""
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid ""
 "However, the Internet connectivity test failed. You should test your "
 "connection manually, and verify your Internet modem or router."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:776
 #, fuzzy, c-format
 msgid ""
 "If your connection does not work, you might want to relaunch the "
@@ -4714,7 +4800,7 @@ msgstr ""
 "net_monitor か Mandriva コントロールセンターで接続をテストしてください。\n"
 "接続できない場合は再設定してください。"
 
-#: ../lib/network/netconnect.pm:771
+#: ../lib/network/netconnect.pm:778
 #, fuzzy, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
 msgstr ""
@@ -4722,7 +4808,7 @@ msgstr ""
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:779
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -4731,78 +4817,78 @@ msgstr ""
 "設定が完了したら、ホスト名に関連した問題を避けるために、X を再起動することを"
 "お勧めします。"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB モデム"
 
-#: ../lib/network/netconnect.pm:784 ../lib/network/netconnect.pm:785
+#: ../lib/network/netconnect.pm:791 ../lib/network/netconnect.pm:792
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan モデム"
 
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:793
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus モデム"
 
-#: ../lib/network/netconnect.pm:787
+#: ../lib/network/netconnect.pm:794
 #, c-format
 msgid "LAN connection"
 msgstr "LAN 接続"
 
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:798
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 接続"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:799
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: ../lib/network/netconnect.pm:793
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 接続"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:802
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を検出)"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected)"
 msgstr "(検出)"
 
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf ホスト名の解決"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -4815,17 +4901,17 @@ msgstr ""
 "共有リソースを提示するときに使用する名前です。\n"
 "たいていのネットワークでは必要ありません。"
 
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:811
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf ホスト名"
 
-#: ../lib/network/netconnect.pm:805
+#: ../lib/network/netconnect.pm:812
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf ホスト名にはピリオド (.) を含めることはできません。"
 
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:813
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -4837,12 +4923,12 @@ msgstr ""
 "現在の設定をそのまま使うには「OK」をクリックしてください。ネットワーク/\n"
 "インターネットを再設定する場合は「キャンセル」を押します。\n"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: ../lib/network/netconnect.pm:810
+#: ../lib/network/netconnect.pm:817
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -4853,7 +4939,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:811
+#: ../lib/network/netconnect.pm:818
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -4866,12 +4952,12 @@ msgstr ""
 "\n"
 "続けるには「%s」を押してください。"
 
-#: ../lib/network/netconnect.pm:812
+#: ../lib/network/netconnect.pm:819
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: ../lib/network/netconnect.pm:813
+#: ../lib/network/netconnect.pm:820
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -4882,17 +4968,17 @@ msgstr ""
 "お使いになるものを選んでください。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:814
+#: ../lib/network/netconnect.pm:821
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: ../lib/network/netconnect.pm:816
+#: ../lib/network/netconnect.pm:823
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: ../lib/network/netconnect.pm:817
+#: ../lib/network/netconnect.pm:824
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -4901,7 +4987,7 @@ msgstr ""
 "以下のプロトコルが LAN 接続の設定に使用できます。使用するものを選んでくださ"
 "い。"
 
-#: ../lib/network/netconnect.pm:818
+#: ../lib/network/netconnect.pm:825
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -4913,27 +4999,27 @@ msgstr ""
 "'mybox.mylab.myco.com' のように完全修飾ホスト名を\n"
 "入れてください。ゲートウェイの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:823
+#: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "DNS サーバの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:824
+#: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS サーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:825
+#: ../lib/network/netconnect.pm:832
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:826
+#: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:847
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -4942,12 +5028,12 @@ msgstr ""
 "予期しないエラーが発生しました:\n"
 "%s"
 
-#: ../lib/network/network.pm:494
+#: ../lib/network/network.pm:514
 #, c-format
 msgid "Advanced network settings"
 msgstr "ネットワークの上級設定"
 
-#: ../lib/network/network.pm:495
+#: ../lib/network/network.pm:515
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -4956,57 +5042,62 @@ msgstr ""
 "ここでネットワークの上級オプションを設定できます。変更を適用するにはマシンを"
 "再起動する必要があります。"
 
-#: ../lib/network/network.pm:496
+#: ../lib/network/network.pm:517
+#, fuzzy, c-format
+msgid "Wireless regulatory domain"
+msgstr "ワイヤレスネットワーク"
+
+#: ../lib/network/network.pm:518
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP の設定"
 
-#: ../lib/network/network.pm:497
+#: ../lib/network/network.pm:519
 #, c-format
 msgid "Disable IPv6"
 msgstr "IPv6 を無効にする"
 
-#: ../lib/network/network.pm:498
+#: ../lib/network/network.pm:520
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr ""
 
-#: ../lib/network/network.pm:499
+#: ../lib/network/network.pm:521
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "TCP タイムスタンプを無効にする"
 
-#: ../lib/network/network.pm:500
+#: ../lib/network/network.pm:522
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "セキュリティ設定 (MSEC ポリシーによる定義)"
 
-#: ../lib/network/network.pm:501
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "ICMP エコーを無効にする"
 
-#: ../lib/network/network.pm:502
+#: ../lib/network/network.pm:524
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr ""
 
-#: ../lib/network/network.pm:503
+#: ../lib/network/network.pm:525
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr ""
 
-#: ../lib/network/network.pm:504
+#: ../lib/network/network.pm:526
 #, c-format
 msgid "Log strange packets"
 msgstr ""
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:539
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロキシの設定"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:540
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
@@ -5014,42 +5105,42 @@ msgid ""
 msgstr ""
 "ここでプロキシを設定をすることができます (例: http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:516
+#: ../lib/network/network.pm:541
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:542
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 接続に HTTP プロキシを使う"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:543
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS プロキシ"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:544
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP プロキシ"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:545
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "プロキシなし (カンマで区切って指定):"
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロキシは http://... で始まります"
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "プロキシは http://... または https://... でなければなりません"
 
-#: ../lib/network/network.pm:527
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL は ftp: か http: で始まります"
@@ -5336,6 +5427,29 @@ msgid "Use specific UDP port"
 msgstr "特定の UDP ポートを使う"
 
 #~ msgid ""
+#~ "Name of the profile to create (the new profile is created as a copy of "
+#~ "the current one):"
+#~ msgstr ""
+#~ "作成するプロファイルの名前 (新しいプロファイルは現在のプロファイルのコピー"
+#~ "として作成します):"
+
+#~ msgid ""
+#~ "This tool allows to activate an existing network profile, and to manage "
+#~ "(clone, delete) profiles."
+#~ msgstr ""
+#~ "このツールでは、既存のネットワークプロファイルの有効化と、プロファイルの管"
+#~ "理 (複製や削除) を行います。"
+
+#~ msgid "To modify a profile, you have to activate it first."
+#~ msgstr "プロファイルを編集するには、先にそれを有効にしなければなりません。"
+
+#~ msgid "Clone"
+#~ msgstr "複製する"
+
+#~ msgid "Please select the Windows driver (.inf file)"
+#~ msgstr "Windows のドライバ (.inf ファイル) を選んでください"
+
+#~ msgid ""
 #~ "There is only one configured network adapter on your system:\n"
 #~ "\n"
 #~ "%s\n"
@@ -6345,9 +6459,6 @@ msgstr "特定の UDP ポートを使う"
 #~ msgid "none"
 #~ msgstr "なし"
 
-#~ msgid "Mode"
-#~ msgstr "モード"
-
 #~ msgid "tunnel"
 #~ msgstr "トンネル"
 
@@ -6486,9 +6597,6 @@ msgstr "特定の UDP ポートを使う"
 #~ msgid "Vendor"
 #~ msgstr "ベンダー"
 
-#~ msgid "Description"
-#~ msgstr "説明"
-
 #~ msgid "Media class"
 #~ msgstr "メディアクラス"
 
@@ -6507,9 +6615,6 @@ msgstr "特定の UDP ポートを使う"
 #~ msgid "Remove a network interface"
 #~ msgstr "リモートネットワークインターフェース"
 
-#~ msgid "Select the network interface to remove:"
-#~ msgstr "削除するネットワークインターフェースを選択:"
-
 #~ msgid ""
 #~ "An error occurred while deleting the \"%s\" network interface:\n"
 #~ "\n"