merge last updates

1 files changed, 370 insertions, 364 deletions

diff --git a/po/ja.po b/po/ja.po
index c17a2cc..957c75e 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-10-20 08:41-0200\n"
+"POT-Creation-Date: 2011-05-03 15:42+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 <mageia-i18n@mandrivalinux.org>\n"
@@ -29,9 +29,9 @@ msgstr "ネットワークの設定 (%d アダプタ)"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
-#: ../lib/network/vpn/openvpn.pm:221
+#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
+#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP アドレス"
@@ -72,7 +72,7 @@ msgstr "LAN の設定"
 msgid "Configure Local Area Network..."
 msgstr "LAN を設定..."
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:190
+#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
@@ -99,11 +99,11 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../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/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
@@ -143,7 +143,7 @@ msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:148
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
@@ -158,21 +158,21 @@ msgstr "起動プロトコル"
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP クライアント"
 
 #: ../bin/drakconnect-old:247
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "このインターフェースはまだ設定されていません。\n"
 "Mageia コントロールセンターの「%s」を実行してください。"
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:104
+#: ../bin/drakconnect-old:247 ../bin/net_applet:105
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "新しいネットワーク・インターフェースを設定 (LAN/ISDN/ADSL...)"
@@ -303,7 +303,7 @@ msgstr "LAN に接続するネットワークアダプタを選んでくださ�
 msgid "Local Area Network settings"
 msgstr "ローカルネットワークの設定"
 
-#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:229
 #, c-format
 msgid "Local IP address"
 msgstr "ローカル IPアドレス"
@@ -313,8 +313,8 @@ msgstr "ローカル IPアドレス"
 msgid "The internal domain name"
 msgstr "内部ドメイン名"
 
-#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
-#: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
+#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:236
+#: ../bin/drakhosts:243 ../bin/drakhosts:250 ../bin/drakinvictus:72
 #: ../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
@@ -322,13 +322,13 @@ msgstr "内部ドメイン名"
 #: ../bin/draksambashare:403 ../bin/draksambashare:455
 #: ../bin/draksambashare:479 ../bin/draksambashare:552
 #: ../bin/draksambashare:629 ../bin/draksambashare:695
-#: ../bin/draksambashare:795 ../bin/draksambashare:802
-#: ../bin/draksambashare:941 ../bin/draksambashare:1095
-#: ../bin/draksambashare:1114 ../bin/draksambashare:1146
-#: ../bin/draksambashare:1252 ../bin/draksambashare:1354
-#: ../bin/draksambashare:1363 ../bin/draksambashare:1385
-#: ../bin/draksambashare:1394 ../bin/draksambashare:1413
-#: ../bin/draksambashare:1422 ../bin/draksambashare:1434
+#: ../bin/draksambashare:795 ../bin/draksambashare:803
+#: ../bin/draksambashare:942 ../bin/draksambashare:1096
+#: ../bin/draksambashare:1115 ../bin/draksambashare:1147
+#: ../bin/draksambashare:1253 ../bin/draksambashare:1355
+#: ../bin/draksambashare:1364 ../bin/draksambashare:1386
+#: ../bin/draksambashare:1395 ../bin/draksambashare:1414
+#: ../bin/draksambashare:1423 ../bin/draksambashare:1435
 #: ../lib/network/connection/xdsl.pm:361
 #: ../lib/network/connection_manager.pm:62
 #: ../lib/network/connection_manager.pm:68
@@ -337,16 +337,15 @@ msgstr "内部ドメイン名"
 #: ../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/connection_manager.pm:481 ../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: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
+#: ../lib/network/thirdparty.pm:230 ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Error"
 msgstr "エラー"
@@ -541,10 +540,9 @@ msgstr "ホスト名:"
 msgid "Host Aliases:"
 msgstr "ホストエイリアス:"
 
-#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draknfs:116
-#: ../bin/draksambashare:230 ../bin/draksambashare:253
-#: ../bin/draksambashare:397 ../bin/draksambashare:625
-#: ../bin/draksambashare:791
+#: ../bin/drakhosts:122 ../bin/draknfs:116 ../bin/draksambashare:230
+#: ../bin/draksambashare:253 ../bin/draksambashare:397
+#: ../bin/draksambashare:625 ../bin/draksambashare:791
 #, c-format
 msgid "Error!"
 msgstr "エラー"
@@ -554,73 +552,68 @@ msgstr "エラー"
 msgid "Please enter a valid IP address."
 msgstr "有効な IP アドレスを入力してください。"
 
-#: ../bin/drakhosts:128
-#, c-format
-msgid "Same IP is already in %s file."
-msgstr "同じ IP が既に %s ファイルにあります。"
-
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
+#: ../bin/drakhosts:187 ../lib/network/connection/ethernet.pm:225
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
 
-#: ../bin/drakhosts:196
+#: ../bin/drakhosts:187
 #, c-format
 msgid "Host Aliases"
 msgstr "ホストエイリアス"
 
-#: ../bin/drakhosts:206 ../bin/drakhosts:236
+#: ../bin/drakhosts:197 ../bin/drakhosts:227
 #, c-format
 msgid "Manage hosts definitions"
 msgstr "ホストの定義を管理"
 
-#: ../bin/drakhosts:222 ../bin/drakhosts:249 ../bin/draknfs:369
+#: ../bin/drakhosts:213 ../bin/drakhosts:240 ../bin/draknfs:369
 #, c-format
 msgid "Modify entry"
 msgstr "エントリを変更"
 
-#: ../bin/drakhosts:241 ../bin/draknfs:601 ../bin/draksambashare:1347
-#: ../bin/draksambashare:1378 ../bin/draksambashare:1409
+#: ../bin/drakhosts:232 ../bin/draknfs:601 ../bin/draksambashare:1348
+#: ../bin/draksambashare:1379 ../bin/draksambashare:1410
 #, c-format
 msgid "Add"
 msgstr "追加"
 
-#: ../bin/drakhosts:242
+#: ../bin/drakhosts:233
 #, c-format
 msgid "Add entry"
 msgstr "エントリを追加"
 
-#: ../bin/drakhosts:245
+#: ../bin/drakhosts:236
 #, c-format
 msgid "Failed to add host."
 msgstr "ホストの追加に失敗しました。"
 
-#: ../bin/drakhosts:248 ../bin/draknfs:608 ../bin/draksambashare:1304
-#: ../bin/draksambashare:1349 ../bin/draksambashare:1380
-#: ../bin/draksambashare:1417
+#: ../bin/drakhosts:239 ../bin/draknfs:608 ../bin/draksambashare:1305
+#: ../bin/draksambashare:1350 ../bin/draksambashare:1381
+#: ../bin/draksambashare:1418
 #, c-format
 msgid "Modify"
 msgstr "変更"
 
-#: ../bin/drakhosts:252
+#: ../bin/drakhosts:243
 #, c-format
 msgid "Failed to Modify host."
 msgstr "ホストの変更に失敗しました。"
 
-#: ../bin/drakhosts:255 ../bin/drakids:95 ../bin/drakids:104
-#: ../bin/draknfs:615 ../bin/draksambashare:1305 ../bin/draksambashare:1357
-#: ../bin/draksambashare:1388 ../bin/draksambashare:1425
+#: ../bin/drakhosts:246 ../bin/drakids:95 ../bin/drakids:104
+#: ../bin/draknfs:615 ../bin/draksambashare:1306 ../bin/draksambashare:1358
+#: ../bin/draksambashare:1389 ../bin/draksambashare:1426
 #, c-format
 msgid "Remove"
 msgstr "削除"
 
-#: ../bin/drakhosts:259
+#: ../bin/drakhosts:250
 #, c-format
 msgid "Failed to remove host."
 msgstr "ホストの削除に失敗しました。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:219
-#: ../bin/net_applet:191 ../lib/network/drakroam.pm:93
+#: ../bin/drakhosts:253 ../bin/drakinvictus:141 ../bin/draknetprofile:219
+#: ../bin/net_applet:221 ../lib/network/drakroam.pm:93
 #: ../lib/network/netcenter.pm:178
 #, c-format
 msgid "Quit"
@@ -633,15 +626,15 @@ 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:134 ../bin/net_applet:313
-#: ../lib/network/drakfirewall.pm:311 ../lib/network/drakfirewall.pm:315
+#: ../bin/net_applet:145 ../bin/net_applet:353
+#: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
 #, c-format
 msgid "Interactive Firewall"
 msgstr "対話式ファイアウォール"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:313
+#: ../bin/net_applet:353
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "デーモンに接続できません"
@@ -718,7 +711,7 @@ msgstr "日付"
 msgid "Remote host"
 msgstr "リモートホスト"
 
-#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:115
+#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:117
 #, c-format
 msgid "Type"
 msgstr "種類"
@@ -1528,8 +1521,8 @@ msgid "Draksambashare"
 msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
-#, c-format
-msgid "Copyright (C) %s by Mageia"
+#, fuzzy, c-format
+msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
@@ -1639,7 +1632,7 @@ msgstr "PDF ジェネレータが既に存在します。"
 msgid "Printers and print$ already exist."
 msgstr "プリンタと print$ は既に存在します。"
 
-#: ../bin/draksambashare:529 ../bin/draksambashare:1197
+#: ../bin/draksambashare:529 ../bin/draksambashare:1198
 #, c-format
 msgid "Congratulations"
 msgstr "おめでとうございます"
@@ -1771,52 +1764,52 @@ msgid ""
 msgstr ""
 "create mask/create mode/directory mask は数字で指定してください (例: 0755)"
 
-#: ../bin/draksambashare:802
+#: ../bin/draksambashare:803
 #, c-format
 msgid "Please create this Samba user: %s"
 msgstr "次の Samba ユーザを作成: %s"
 
-#: ../bin/draksambashare:914
+#: ../bin/draksambashare:915
 #, c-format
 msgid "Add Samba user"
 msgstr "Samba ユーザを追加"
 
-#: ../bin/draksambashare:929
+#: ../bin/draksambashare:930
 #, c-format
 msgid "User information"
 msgstr "ユーザ情報"
 
-#: ../bin/draksambashare:931
+#: ../bin/draksambashare:932
 #, c-format
 msgid "User name:"
 msgstr "ユーザ名:"
 
-#: ../bin/draksambashare:932
+#: ../bin/draksambashare:933
 #, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../bin/draksambashare:1046
+#: ../bin/draksambashare:1047
 #, c-format
 msgid "PDC - primary domain controller"
 msgstr "PDC - プライマリドメインコントローラ"
 
-#: ../bin/draksambashare:1047
+#: ../bin/draksambashare:1048
 #, c-format
 msgid "Standalone - standalone server"
 msgstr "スタンドアロン - スタンドアロンサーバ"
 
-#: ../bin/draksambashare:1053
+#: ../bin/draksambashare:1054
 #, c-format
 msgid "Samba Wizard"
 msgstr "Samba ウィザード"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid "Samba server configuration Wizard"
 msgstr "Samba サーバ設定ウィザード"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
@@ -1825,12 +1818,12 @@ msgstr ""
 "Samba によって、あなたのサーバを Linux 以外のワークステーションから利用できる"
 "ファイルおよびプリンタサーバにすることができます。"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid "PDC server: primary domain controller"
 msgstr "PDC サーバ: プライマリドメインコントローラ"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
@@ -1838,40 +1831,40 @@ msgid ""
 msgstr ""
 "PDC として設定されたサーバは、ドメイン全体で Windows の認証を行います。"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
 
-#: ../bin/draksambashare:1089
+#: ../bin/draksambashare:1090
 #, c-format
 msgid "Wins support:"
 msgstr "Wins サポート:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "admin users:"
 msgstr "管理者ユーザ:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "root @adm"
 msgstr "root @adm"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid "Os level:"
 msgstr "OS レベル:"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
@@ -1881,43 +1874,43 @@ msgid ""
 "ie: os level = 34"
 msgstr ""
 
-#: ../bin/draksambashare:1095
+#: ../bin/draksambashare:1096
 #, c-format
 msgid "The domain is wrong."
 msgstr "ドメインが間違っています。"
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Samba はサービスを提供する Windows のワークグループを知る必要があります。"
 
-#: ../bin/draksambashare:1109 ../bin/draksambashare:1176
+#: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
 msgid "Workgroup:"
 msgstr "ワークグループ:"
 
-#: ../bin/draksambashare:1110
+#: ../bin/draksambashare:1111
 #, c-format
 msgid "Netbios name:"
 msgstr "Netbios 名:"
 
-#: ../bin/draksambashare:1114
+#: ../bin/draksambashare:1115
 #, c-format
 msgid "The Workgroup is wrong."
 msgstr "ワークグループが間違っています。"
 
-#: ../bin/draksambashare:1121 ../bin/draksambashare:1131
+#: ../bin/draksambashare:1122 ../bin/draksambashare:1132
 #, c-format
 msgid "Security mode"
 msgstr "セキュリティモード"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
@@ -1926,12 +1919,12 @@ msgstr ""
 "ユーザレベル: クライアントは、プロトコルネゴシエーションの直後にセッション"
 "セットアップ要求を送ります。この要求には、ユーザ名とパスワードが含まれます。"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr ""
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
@@ -1939,17 +1932,17 @@ msgid ""
 "is shared between domain (security) controllers."
 msgstr ""
 
-#: ../bin/draksambashare:1132
+#: ../bin/draksambashare:1133
 #, c-format
 msgid "Hosts allow"
 msgstr "許可するホスト"
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid "Server Banner."
 msgstr "サーバのバナー。"
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
@@ -1958,22 +1951,22 @@ msgstr ""
 "バナーは、Windows のワークステーションに対して、このサーバに関する情報を提供"
 "します。"
 
-#: ../bin/draksambashare:1142
+#: ../bin/draksambashare:1143
 #, c-format
 msgid "Banner:"
 msgstr "バナー:"
 
-#: ../bin/draksambashare:1146
+#: ../bin/draksambashare:1147
 #, c-format
 msgid "The Server Banner is incorrect."
 msgstr "サーバのバナーが正しくありません。"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Samba Log"
 msgstr "Samba ログ"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
@@ -1982,37 +1975,37 @@ msgstr ""
 "ログファイル: 接続するマシンごとに別々のファイルにログを取る場合は、file.%m "
 "を使います。"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr "ログレベル: ログレベル (冗長さ) を 0 から 10 の値で設定します"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr "ログの最大サイズ: ログファイルの最大サイズを制限します (単位: Kb)。"
 
-#: ../bin/draksambashare:1160 ../bin/draksambashare:1178
+#: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
 msgid "Log file:"
 msgstr "ログファイル:"
 
-#: ../bin/draksambashare:1161
+#: ../bin/draksambashare:1162
 #, c-format
 msgid "Max log size:"
 msgstr "ログの最大サイズ:"
 
-#: ../bin/draksambashare:1162
+#: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level:"
 msgstr "ログレベル:"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "ウィザードは Samba を設定するために以下のパラメータを収集しました。"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -2021,7 +2014,7 @@ msgstr ""
 "これらの値でサーバを設定する場合は「次へ」を、値を訂正する場合は「戻る」をク"
 "リックしてください。"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
@@ -2030,112 +2023,112 @@ msgstr ""
 "既に作成されている共有があれば、この設定に現れます。共有を管理するに"
 "は、'drakwizard sambashare' を実行してください。"
 
-#: ../bin/draksambashare:1175
+#: ../bin/draksambashare:1176
 #, c-format
 msgid "Samba type:"
 msgstr "Samba の種類:"
 
-#: ../bin/draksambashare:1177
+#: ../bin/draksambashare:1178
 #, c-format
 msgid "Server banner:"
 msgstr "サーバのバナー:"
 
-#: ../bin/draksambashare:1179
+#: ../bin/draksambashare:1180
 #, c-format
 msgid " "
 msgstr " "
 
-#: ../bin/draksambashare:1180
+#: ../bin/draksambashare:1181
 #, c-format
 msgid "Unix Charset:"
 msgstr "Unix 文字セット:"
 
-#: ../bin/draksambashare:1181
+#: ../bin/draksambashare:1182
 #, c-format
 msgid "Dos Charset:"
 msgstr "Dos 文字セット:"
 
-#: ../bin/draksambashare:1182
+#: ../bin/draksambashare:1183
 #, c-format
 msgid "Display Charset:"
 msgstr "ディスプレイの文字セット:"
 
-#: ../bin/draksambashare:1197
+#: ../bin/draksambashare:1198
 #, c-format
 msgid "The wizard successfully configured your Samba server."
 msgstr "Samba サーバの設定が完了しました。"
 
-#: ../bin/draksambashare:1252
+#: ../bin/draksambashare:1253
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba 設定ウィザードが予期せず失敗しました:"
 
-#: ../bin/draksambashare:1266
+#: ../bin/draksambashare:1267
 #, c-format
 msgid "Manage Samba configuration"
 msgstr "Samba 設定を管理"
 
-#: ../bin/draksambashare:1354
+#: ../bin/draksambashare:1355
 #, c-format
 msgid "Failed to Modify Samba share."
 msgstr "Samba 共有の変更に失敗しました。"
 
-#: ../bin/draksambashare:1363
+#: ../bin/draksambashare:1364
 #, c-format
 msgid "Failed to remove a Samba share."
 msgstr "Samba 共有の削除に失敗しました。"
 
-#: ../bin/draksambashare:1370
+#: ../bin/draksambashare:1371
 #, c-format
 msgid "File share"
 msgstr "ファイル共有"
 
-#: ../bin/draksambashare:1385
+#: ../bin/draksambashare:1386
 #, c-format
 msgid "Failed to Modify."
 msgstr "変更に失敗しました。"
 
-#: ../bin/draksambashare:1394
+#: ../bin/draksambashare:1395
 #, c-format
 msgid "Failed to remove."
 msgstr "削除に失敗しました。"
 
-#: ../bin/draksambashare:1401
+#: ../bin/draksambashare:1402
 #, c-format
 msgid "Printers"
 msgstr "プリンタ"
 
-#: ../bin/draksambashare:1413
+#: ../bin/draksambashare:1414
 #, c-format
 msgid "Failed to add user."
 msgstr "ユーザの追加に失敗しました。"
 
-#: ../bin/draksambashare:1422
+#: ../bin/draksambashare:1423
 #, c-format
 msgid "Failed to change user password."
 msgstr "ユーザパスワードの変更に失敗しました。"
 
-#: ../bin/draksambashare:1434
+#: ../bin/draksambashare:1435
 #, c-format
 msgid "Failed to delete user."
 msgstr "ユーザの削除に失敗しました。"
 
-#: ../bin/draksambashare:1439
+#: ../bin/draksambashare:1440
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../bin/draksambashare:1447
+#: ../bin/draksambashare:1448
 #, c-format
 msgid "Samba Users"
 msgstr "Samba ユーザ"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid "Please configure your Samba server"
 msgstr "Samba サーバを設定してください"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid ""
 "It seems this is the first time you run this tool.\n"
@@ -2144,138 +2137,138 @@ msgstr ""
 "今回初めてこのツールを起動したようです。\n"
 "Samba サーバの基本的な設定を行うためのウィザードが表示されます。"
 
-#: ../bin/draksambashare:1464
+#: ../bin/draksambashare:1465
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba は Samba 共有を管理します"
 
-#: ../bin/net_applet:95
+#: ../bin/net_applet:96
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "インターフェース %s のネットワークが動作中"
 
-#: ../bin/net_applet:96
+#: ../bin/net_applet:97
 #, c-format
 msgid "IP address: %s"
 msgstr "IP アドレス: %s"
 
-#: ../bin/net_applet:97
+#: ../bin/net_applet:98
 #, c-format
 msgid "Gateway: %s"
 msgstr "ゲートウェイ: %s"
 
-#: ../bin/net_applet:98
+#: ../bin/net_applet:99
 #, c-format
 msgid "DNS: %s"
 msgstr "DNS: %s"
 
-#: ../bin/net_applet:99
+#: ../bin/net_applet:100
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "%s に接続しました (リンクレベル: %d %%)"
 
-#: ../bin/net_applet:101
+#: ../bin/net_applet:102
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "インターフェース %s のネットワークはダウンしています"
 
-#: ../bin/net_applet:103
-#, c-format
+#: ../bin/net_applet:104
+#, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "インターネットの接続が設定されていません。\n"
 "Mageia コントロールセンターの「%s」を実行してください。"
 
-#: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
+#: ../bin/net_applet:107 ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "接続..."
 
-#: ../bin/net_applet:131 ../bin/net_monitor:519
+#: ../bin/net_applet:133 ../bin/net_monitor:519
 #, c-format
 msgid "Connect %s"
 msgstr "%s に接続"
 
-#: ../bin/net_applet:132 ../bin/net_monitor:519
+#: ../bin/net_applet:137 ../bin/net_monitor:519
 #, c-format
 msgid "Disconnect %s"
 msgstr "%s を切断"
 
-#: ../bin/net_applet:133
+#: ../bin/net_applet:141
 #, c-format
 msgid "Monitor Network"
 msgstr "ネットワークをモニタ"
 
-#: ../bin/net_applet:135
+#: ../bin/net_applet:149
 #, c-format
 msgid "Manage wireless networks"
 msgstr "ワイヤレスネットワークを管理"
 
-#: ../bin/net_applet:137
+#: ../bin/net_applet:153
 #, c-format
 msgid "Manage VPN connections"
 msgstr "VPN 接続を管理"
 
-#: ../bin/net_applet:141
+#: ../bin/net_applet:157
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークを設定"
 
-#: ../bin/net_applet:143
+#: ../bin/net_applet:161
 #, c-format
 msgid "Watched interface"
 msgstr "監視中のインターフェース"
 
-#: ../bin/net_applet:144 ../bin/net_applet:145 ../bin/net_applet:147
+#: ../bin/net_applet:162 ../bin/net_applet:165 ../bin/net_applet:168
 #, c-format
 msgid "Auto-detect"
 msgstr "自動検出"
 
-#: ../bin/net_applet:152
+#: ../bin/net_applet:173
 #, c-format
 msgid "Active interfaces"
 msgstr "アクティブなインターフェース"
 
-#: ../bin/net_applet:172
+#: ../bin/net_applet:193
 #, c-format
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: ../bin/net_applet:182 ../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
+#: ../bin/net_applet:203 ../lib/network/connection.pm:233
+#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:367
+#: ../lib/network/vpn/openvpn.pm:381 ../lib/network/vpn/openvpn.pm:392
 #, c-format
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../bin/net_applet:394
+#: ../bin/net_applet:434
 #, c-format
 msgid "Network connection"
 msgstr "ネットワーク接続"
 
-#: ../bin/net_applet:481
+#: ../bin/net_applet:521
 #, c-format
 msgid "More networks"
 msgstr "他のネットワーク"
 
-#: ../bin/net_applet:508
+#: ../bin/net_applet:548
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "対話式ファイアウォールの自動モード"
 
-#: ../bin/net_applet:513
+#: ../bin/net_applet:553
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に開始"
 
-#: ../bin/net_applet:518
+#: ../bin/net_applet:558
 #, c-format
 msgid "Wireless networks"
 msgstr "ワイヤレスネットワーク"
 
-#: ../bin/net_applet:525 ../bin/net_monitor:96
+#: ../bin/net_applet:565 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "設定"
@@ -2374,10 +2367,10 @@ msgid "Connection complete."
 msgstr "接続完了。"
 
 #: ../bin/net_monitor:258
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mageia Control Center."
+"Verify your configuration in the Mageia Linux Control Center."
 msgstr ""
 "接続に失敗しました。\n"
 "Mageia コントロールセンターの設定を確認してください。"
@@ -2446,22 +2439,22 @@ msgstr "インターネット接続が設定されていません"
 msgid "Unknown connection type"
 msgstr "未知の接続タイプ"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:166
 #, c-format
 msgid "Network access settings"
 msgstr "ネットワークアクセスの設定"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:167
 #, c-format
 msgid "Access settings"
 msgstr "アクセスの設定"
 
-#: ../lib/network/connection.pm:164
+#: ../lib/network/connection.pm:168
 #, c-format
 msgid "Address settings"
 msgstr "アドレスの設定"
 
-#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
+#: ../lib/network/connection.pm:182 ../lib/network/connection.pm:202
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
 #: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
 #: ../lib/network/netconnect.pm:591
@@ -2469,49 +2462,54 @@ msgstr "アドレスの設定"
 msgid "Unlisted - edit manually"
 msgstr "該当なし - 手動で編集"
 
-#: ../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
+#: ../lib/network/connection.pm:235 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:129
+#: ../lib/network/vpn/openvpn.pm:173 ../lib/network/vpn/openvpn.pm:341
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "ユーザに接続の管理を許可しますか？"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Start the connection at boot"
 msgstr "起動時に接続を開始"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:249
 #, c-format
 msgid "Enable traffic accounting"
 msgstr ""
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:250
+#, c-format
+msgid "Allow interface to be controlled by Network Manager"
+msgstr ""
+
+#: ../lib/network/connection.pm:251
 #, c-format
 msgid "Metric"
 msgstr "Metric"
 
-#: ../lib/network/connection.pm:247
+#: ../lib/network/connection.pm:252
 #, c-format
 msgid "MTU"
 msgstr ""
 
-#: ../lib/network/connection.pm:248
+#: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr ""
 
-#: ../lib/network/connection.pm:324
+#: ../lib/network/connection.pm:333
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "インターフェース %s にリンクを検出"
 
-#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
+#: ../lib/network/connection.pm:334 ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "インターフェース %s でリンクビートが失われました"
@@ -2537,13 +2535,13 @@ msgid "Authentication"
 msgstr "認証"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカウントのログイン (ユーザ名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
@@ -2573,22 +2571,22 @@ msgstr "PIN のフォーマットが不正です。4 桁の数字でなければ
 msgid "GPRS/Edge/3G"
 msgstr "GPRS/Edge/3G"
 
-#: ../lib/network/connection/cellular_card.pm:110
+#: ../lib/network/connection/cellular_card.pm:140
 #, c-format
 msgid "PIN number (4 digits). Leave empty if PIN is not required."
 msgstr ""
 
-#: ../lib/network/connection/cellular_card.pm:186
+#: ../lib/network/connection/cellular_card.pm:216
 #, c-format
 msgid "Unable to open device %s"
 msgstr "デバイス %s を開けません"
 
-#: ../lib/network/connection/cellular_card.pm:218
+#: ../lib/network/connection/cellular_card.pm:248
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "SIM カードが挿入されていることを確認してください。"
 
-#: ../lib/network/connection/cellular_card.pm:229
+#: ../lib/network/connection/cellular_card.pm:259
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -2644,7 +2642,7 @@ msgstr ""
 "選択されたデバイス (%s ドライバを使用) にはネットワークインターフェースが見つ"
 "かりません。"
 
-#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
 msgid "Manual configuration"
 msgstr "手動設定"
@@ -2654,12 +2652,12 @@ msgstr "手動設定"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP を自動設定 (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:129
+#: ../lib/network/connection/ethernet.pm:132
 #, c-format
 msgid "IP settings"
 msgstr "IP の設定"
 
-#: ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2670,78 +2668,78 @@ msgstr ""
 "それぞれの項目にはドット区切の形式で IP アドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
-#: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
+#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:151
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS サーバ 1"
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:155
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS サーバ 2"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "Search domain"
 msgstr "検索ドメイン"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
-#: ../lib/network/connection/ethernet.pm:157
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP のタイムアウト (秒)"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:161
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/connection/ethernet.pm:163
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ホスト名"
 
-#: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/connection/ethernet.pm:165
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf (169.254.0.0 ネットワーク) にフォールバックしない"
 
-#: ../lib/network/connection/ethernet.pm:173
+#: ../lib/network/connection/ethernet.pm:176
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP アドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:178
+#: ../lib/network/connection/ethernet.pm:181
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:183
+#: ../lib/network/connection/ethernet.pm:186
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP アドレス %s は通常保留されています"
 
-#: ../lib/network/connection/ethernet.pm:192
+#: ../lib/network/connection/ethernet.pm:195
 #, fuzzy, c-format
 msgid ""
 "%s is already used by a connection that starts on boot (%s). To use this "
@@ -2752,12 +2750,12 @@ msgstr ""
 "この接続に使うには、先にそれを使う他のすべてのデバイスを無効にするか、それら"
 "が起動時に開始しないように設定してください。"
 
-#: ../lib/network/connection/ethernet.pm:219
+#: ../lib/network/connection/ethernet.pm:222
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP アドレスからホスト名を割り当てる"
 
-#: ../lib/network/connection/ethernet.pm:220
+#: ../lib/network/connection/ethernet.pm:223
 #, c-format
 msgid ""
 "This will allow the server to attribute a name for this machine. If the "
@@ -2765,7 +2763,7 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:223
+#: ../lib/network/connection/ethernet.pm:226
 #, c-format
 msgid ""
 "You should define a hostname for this machine, which will identify this PC. "
@@ -2773,32 +2771,32 @@ msgid ""
 "left blank, 'localhost.localdomain' will be used."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:241
+#: ../lib/network/connection/ethernet.pm:244
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: ../lib/network/connection/ethernet.pm:245
+#: ../lib/network/connection/ethernet.pm:248
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "IPv6 to IPv4 トンネルを有効にする"
 
-#: ../lib/network/connection/ethernet.pm:301
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "インターフェース %s にリンクビートを検出"
 
-#: ../lib/network/connection/ethernet.pm:304
+#: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを要求..."
 
-#: ../lib/network/connection/ethernet.pm:305
+#: ../lib/network/connection/ethernet.pm:308
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを取得"
 
-#: ../lib/network/connection/ethernet.pm:306
+#: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -4023,12 +4021,12 @@ msgstr "WPA/WPA2 事前共有鍵"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:269
+#: ../lib/network/connection/wireless.pm:281
 #, c-format
 msgid "Windows driver"
 msgstr "Windows ドライバ"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:369
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4037,78 +4035,78 @@ msgstr ""
 "ワイヤレスカードが無効になっています。先にワイヤレススイッチ (RF Kill スイッ"
 "チ) を有効にしてください。"
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "Wireless settings"
 msgstr "ワイヤレスの設定"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:464
 #: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Secondary"
 msgstr "セカンダリ"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:467
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "Encryption mode"
 msgstr "暗号化モード"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid "Encryption key"
 msgstr "暗号鍵"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "パスワード"
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "この鍵を強制的に ASCII 文字列として使う (例えば Livebox 用)"
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:484
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP ログイン/ユーザ名"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:486
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4116,12 +4114,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:489
 #, c-format
 msgid "EAP Password"
 msgstr "EAP パスワード"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4140,12 +4138,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:503
+#: ../lib/network/connection/wireless.pm:506
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP クライアント証明書"
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:508
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4154,32 +4152,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid "Network ID"
 msgstr "ネットワーク ID"
 
-#: ../lib/network/connection/wireless.pm:510
+#: ../lib/network/connection/wireless.pm:513
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:514
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:515
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート (b/s)"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4199,17 +4197,17 @@ msgstr ""
 "のメカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータを auto/fixed/off に設定することもできます。"
 
-#: ../lib/network/connection/wireless.pm:521
+#: ../lib/network/connection/wireless.pm:524
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/connection/wireless.pm:525
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:526
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4225,12 +4223,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:530
+#: ../lib/network/connection/wireless.pm:533
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:534
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4249,12 +4247,12 @@ msgstr ""
 "\n"
 "詳しくは man iwspy(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4278,28 +4276,28 @@ msgstr ""
 "明されています。\n"
 "詳しくは man iwpriv(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP プロトコル"
 
-#: ../lib/network/connection/wireless.pm:553
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4308,79 +4306,79 @@ msgstr ""
 "自動検出は最初に WPA のバージョン 2 を試し、使えない場合は\n"
 "バージョン 1 にフォールバックするので、これをお勧めします。"
 
-#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:560
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP モード"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:563
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:564
+#: ../lib/network/connection/wireless.pm:567
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:569
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4388,12 +4386,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:572
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP フェーズ 2"
 
-#: ../lib/network/connection/wireless.pm:571
+#: ../lib/network/connection/wireless.pm:574
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4402,12 +4400,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:578
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 証明書"
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:580
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4417,12 +4415,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:582
+#: ../lib/network/connection/wireless.pm:585
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:584
+#: ../lib/network/connection/wireless.pm:587
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4432,12 +4430,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:589
+#: ../lib/network/connection/wireless.pm:592
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:590
+#: ../lib/network/connection/wireless.pm:593
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4455,26 +4453,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:613
 #, c-format
 msgid "An encryption key is required."
 msgstr "暗号鍵が必要です。"
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:620
 #, 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:623
+#: ../lib/network/connection/wireless.pm:626
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:630
+#: ../lib/network/connection/wireless.pm:633
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4483,7 +4481,7 @@ msgstr ""
 "単位は k, M, G で入力してください (2.46 GHz の場合は 2.46G)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:636
+#: ../lib/network/connection/wireless.pm:639
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4492,17 +4490,17 @@ msgstr ""
 "単位は k, M, G で入力してください (例: 11M)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:648
+#: ../lib/network/connection/wireless.pm:651
 #, c-format
 msgid "Allow access point roaming"
 msgstr "アクセスポイントローミングを許可"
 
-#: ../lib/network/connection/wireless.pm:773
+#: ../lib/network/connection/wireless.pm:776
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワーク \"%s\" に関連付けました"
 
-#: ../lib/network/connection/wireless.pm:774
+#: ../lib/network/connection/wireless.pm:777
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワークへの関連付けが失われました"
@@ -4604,8 +4602,7 @@ msgid "Please enter settings for network"
 msgstr "ネットワークの設定を入力してください"
 
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:479
-#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
@@ -4630,22 +4627,22 @@ msgstr "信号強度"
 msgid "Encryption"
 msgstr "暗号化"
 
-#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:353 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "ネットワークをスキャンしています..."
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "接続"
 
-#: ../lib/network/connection_manager.pm:445
+#: ../lib/network/connection_manager.pm:447
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "ホスト名が \"%s\" に変わりました"
@@ -4750,7 +4747,7 @@ msgstr "Windows 携帯デバイスの同期"
 msgid "Port scan detection"
 msgstr "ポートスキャンの検出"
 
-#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:228
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
@@ -4761,17 +4758,10 @@ msgstr "ファイアウォールの設定"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mageia machine.\n"
-"For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mageia Security Firewall distribution."
+"This configures a personal firewall for this Mageia machine."
 msgstr ""
-"drakfirewall (ファイアウォール設定ツール)\n"
-"\n"
-"このツールは個人用ファイアウォールの設定を行います。\n"
-"強力なファイアウォール専用ソリューションをお求めの場合は\n"
-"Mageia Security Firewall をご利用ください。"
 
-#: ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:228
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4784,13 +4774,13 @@ msgstr ""
 "先に進む前に drakconnect でネットワーク/インターネットアクセスが\n"
 "設定されていることを確認してください。"
 
-#: ../lib/network/drakfirewall.pm:247 ../lib/network/drakfirewall.pm:249
+#: ../lib/network/drakfirewall.pm:245 ../lib/network/drakfirewall.pm:247
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: ../lib/network/drakfirewall.pm:250
+#: ../lib/network/drakfirewall.pm:248
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -4801,7 +4791,7 @@ msgstr ""
 "正しい例: 139/tcp 139/udp 600:610/tcp 600:610/udp\n"
 "詳しくは /etc/services をご覧ください。"
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:254
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -4816,33 +4806,33 @@ msgstr ""
 "\n"
 "ポートを範囲で指定することもできます。(例: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "インターネットに接続を許可するサービスを選んでください。"
 
-#: ../lib/network/drakfirewall.pm:267 ../lib/network/netconnect.pm:127
-#: ../lib/network/network.pm:540
+#: ../lib/network/drakfirewall.pm:265 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:549
 #, c-format
 msgid "Those settings will be saved for the network profile <b>%s</b>"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:268
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "すべて (ファイアウォールなし)"
 
-#: ../lib/network/drakfirewall.pm:270
+#: ../lib/network/drakfirewall.pm:268
 #, c-format
 msgid "Other ports"
 msgstr "その他のポート"
 
-#: ../lib/network/drakfirewall.pm:271
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "システムログにファイアウォールのメッセージを記録する"
 
-#: ../lib/network/drakfirewall.pm:313
+#: ../lib/network/drakfirewall.pm:311
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4853,7 +4843,7 @@ msgstr ""
 "告を受けることができます。\n"
 "監視するネットワークアクティビティを選んでください。"
 
-#: ../lib/network/drakfirewall.pm:318
+#: ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "対話式ファイアウォールを使う"
@@ -5784,12 +5774,12 @@ msgstr ""
 "予期しないエラーが発生しました:\n"
 "%s"
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Advanced network settings"
 msgstr "ネットワークの上級設定"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:524
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -5798,62 +5788,62 @@ msgstr ""
 "ここでネットワークの上級オプションを設定できます。変更を適用するにはマシンを"
 "再起動する必要があります。"
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:526
 #, fuzzy, c-format
 msgid "Wireless regulatory domain"
 msgstr "ワイヤレスネットワーク"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:527
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP の設定"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:528
 #, c-format
 msgid "Disable IPv6"
 msgstr "IPv6 を無効にする"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:529
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr ""
 
-#: ../lib/network/network.pm:521
+#: ../lib/network/network.pm:530
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "TCP タイムスタンプを無効にする"
 
-#: ../lib/network/network.pm:522
+#: ../lib/network/network.pm:531
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "セキュリティ設定 (MSEC ポリシーによる定義)"
 
-#: ../lib/network/network.pm:523
+#: ../lib/network/network.pm:532
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "ICMP エコーを無効にする"
 
-#: ../lib/network/network.pm:524
+#: ../lib/network/network.pm:533
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr ""
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:534
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr ""
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:535
 #, c-format
 msgid "Log strange packets"
 msgstr ""
 
-#: ../lib/network/network.pm:539
+#: ../lib/network/network.pm:548
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロキシの設定"
 
-#: ../lib/network/network.pm:540
+#: ../lib/network/network.pm:549
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
@@ -5861,42 +5851,42 @@ msgid ""
 msgstr ""
 "ここでプロキシを設定をすることができます (例: http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:541
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: ../lib/network/network.pm:542
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 接続に HTTP プロキシを使う"
 
-#: ../lib/network/network.pm:543
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS プロキシ"
 
-#: ../lib/network/network.pm:544
+#: ../lib/network/network.pm:553
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP プロキシ"
 
-#: ../lib/network/network.pm:545
+#: ../lib/network/network.pm:554
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "プロキシなし (カンマで区切って指定):"
 
-#: ../lib/network/network.pm:550
+#: ../lib/network/network.pm:559
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロキシは http://... で始まります"
 
-#: ../lib/network/network.pm:551
+#: ../lib/network/network.pm:560
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "プロキシは http://... または https://... でなければなりません"
 
-#: ../lib/network/network.pm:552
+#: ../lib/network/network.pm:561
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL は ftp: か http: で始まります"
@@ -5963,12 +5953,12 @@ msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr "これらのパッケージは %s または公式の %s リポジトリにあります。"
 
-#: ../lib/network/thirdparty.pm:154
+#: ../lib/network/thirdparty.pm:152
 #, c-format
 msgid "The following component is missing: %s"
 msgstr "以下のコンポーネントがありません: %s"
 
-#: ../lib/network/thirdparty.pm:156
+#: ../lib/network/thirdparty.pm:154
 #, c-format
 msgid ""
 "The required files can also be installed from this URL:\n"
@@ -5977,47 +5967,47 @@ msgstr ""
 "必要なファイルは次の URL からもインストールできます:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:192
+#: ../lib/network/thirdparty.pm:190
 #, c-format
 msgid "Firmware files are required for this device."
 msgstr "このデバイスにはファームウェアファイルが必要です。"
 
-#: ../lib/network/thirdparty.pm:195 ../lib/network/thirdparty.pm:200
+#: ../lib/network/thirdparty.pm:193 ../lib/network/thirdparty.pm:198
 #, c-format
 msgid "Use a floppy"
 msgstr "フロッピーを使う"
 
-#: ../lib/network/thirdparty.pm:196 ../lib/network/thirdparty.pm:203
+#: ../lib/network/thirdparty.pm:194 ../lib/network/thirdparty.pm:201
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windows のパーティションを使う"
 
-#: ../lib/network/thirdparty.pm:197
+#: ../lib/network/thirdparty.pm:195
 #, c-format
 msgid "Select file"
 msgstr "ファイルを選択"
 
-#: ../lib/network/thirdparty.pm:208
+#: ../lib/network/thirdparty.pm:206
 #, c-format
 msgid "Please select the firmware file (for example: %s)"
 msgstr "ファームウェアファイルを選んでください (例: %s)"
 
-#: ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:230
 #, c-format
 msgid "Unable to find \"%s\" on your Windows system!"
 msgstr "Windows システムに %s が見つかりません"
 
-#: ../lib/network/thirdparty.pm:234
+#: ../lib/network/thirdparty.pm:232
 #, c-format
 msgid "No Windows system has been detected!"
 msgstr "Windows システムを検出できませんでした"
 
-#: ../lib/network/thirdparty.pm:244
+#: ../lib/network/thirdparty.pm:242
 #, c-format
 msgid "Insert floppy"
 msgstr "フロッピーを挿入"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -6026,128 +6016,128 @@ msgstr ""
 "%2$s をルートディレクトリに置いて、FAT 形式のフロッピーをドライブ %1$s に\n"
 "挿入し、「%3$s」を押してください。"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid "Next"
 msgstr "次へ"
 
-#: ../lib/network/thirdparty.pm:255
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "フロッピーアクセスエラー: デバイス %s をマウントできません"
 
-#: ../lib/network/thirdparty.pm:354
+#: ../lib/network/thirdparty.pm:352
 #, c-format
 msgid "Looking for required software and drivers..."
 msgstr "必要なソフトウェアとドライバを探しています..."
 
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait, running device configuration commands..."
 msgstr "デバイス設定コマンドを実行しています。お待ちください..."
 
-#: ../lib/network/vpn/openvpn.pm:107
+#: ../lib/network/vpn/openvpn.pm:109
 #, c-format
 msgid "X509 Public Key Infrastructure"
 msgstr "X509 公開鍵インフラストラクチャ"
 
-#: ../lib/network/vpn/openvpn.pm:108
+#: ../lib/network/vpn/openvpn.pm:110
 #, c-format
 msgid "Static Key"
 msgstr "固定鍵"
 
 #. -PO: please don't translate the CA acronym
-#: ../lib/network/vpn/openvpn.pm:142
+#: ../lib/network/vpn/openvpn.pm:144
 #, c-format
 msgid "Certificate Authority (CA)"
 msgstr "認証局 (CA)"
 
-#: ../lib/network/vpn/openvpn.pm:148
+#: ../lib/network/vpn/openvpn.pm:150
 #, c-format
 msgid "Certificate"
 msgstr "証明書"
 
-#: ../lib/network/vpn/openvpn.pm:154
+#: ../lib/network/vpn/openvpn.pm:156
 #, c-format
 msgid "Key"
 msgstr "鍵"
 
-#: ../lib/network/vpn/openvpn.pm:160
+#: ../lib/network/vpn/openvpn.pm:162
 #, c-format
 msgid "TLS control channel key"
 msgstr "TLS コントロールチャンネル鍵"
 
-#: ../lib/network/vpn/openvpn.pm:167
+#: ../lib/network/vpn/openvpn.pm:169
 #, c-format
 msgid "Key direction"
 msgstr "鍵の方向"
 
-#: ../lib/network/vpn/openvpn.pm:175
+#: ../lib/network/vpn/openvpn.pm:177
 #, c-format
 msgid "Authenticate using username and password"
 msgstr "ユーザ名とパスワードで認証"
 
-#: ../lib/network/vpn/openvpn.pm:181
+#: ../lib/network/vpn/openvpn.pm:183
 #, c-format
 msgid "Check server certificate"
 msgstr "サーバ証明書をチェック"
 
-#: ../lib/network/vpn/openvpn.pm:187
+#: ../lib/network/vpn/openvpn.pm:189
 #, c-format
 msgid "Cipher algorithm"
 msgstr "暗号化アルゴリズム"
 
-#: ../lib/network/vpn/openvpn.pm:191
+#: ../lib/network/vpn/openvpn.pm:193
 #, c-format
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../lib/network/vpn/openvpn.pm:195
+#: ../lib/network/vpn/openvpn.pm:197
 #, c-format
 msgid "Size of cipher key"
 msgstr "暗号化鍵のサイズ"
 
-#: ../lib/network/vpn/openvpn.pm:206
+#: ../lib/network/vpn/openvpn.pm:208
 #, c-format
 msgid "Get from server"
 msgstr "サーバから取得"
 
-#: ../lib/network/vpn/openvpn.pm:216
+#: ../lib/network/vpn/openvpn.pm:218
 #, c-format
 msgid "Gateway port"
 msgstr "ゲートウェイポート"
 
-#: ../lib/network/vpn/openvpn.pm:232
+#: ../lib/network/vpn/openvpn.pm:234
 #, c-format
 msgid "Remote IP address"
 msgstr "リモート IP アドレス"
 
-#: ../lib/network/vpn/openvpn.pm:237
+#: ../lib/network/vpn/openvpn.pm:239
 #, c-format
 msgid "Use TCP protocol"
 msgstr "TCP プロトコルを使う"
 
-#: ../lib/network/vpn/openvpn.pm:243
+#: ../lib/network/vpn/openvpn.pm:245
 #, c-format
 msgid "Virtual network device type"
 msgstr "仮想ネットワークデバイスのタイプ"
 
-#: ../lib/network/vpn/openvpn.pm:250
+#: ../lib/network/vpn/openvpn.pm:252
 #, c-format
 msgid "Virtual network device number (optional)"
 msgstr "仮想ネットワークデバイスの番号 (オプション)"
 
-#: ../lib/network/vpn/openvpn.pm:365
+#: ../lib/network/vpn/openvpn.pm:367
 #, c-format
 msgid "Starting connection.."
 msgstr "接続を開始..."
 
-#: ../lib/network/vpn/openvpn.pm:380
+#: ../lib/network/vpn/openvpn.pm:382
 #, c-format
 msgid "Please insert your token"
 msgstr "あなたのトークンを入れてください"
 
-#: ../lib/network/vpn/openvpn.pm:391
+#: ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "PIN number"
 msgstr "PIN 番号"
@@ -6182,6 +6172,22 @@ msgstr "NAT モード"
 msgid "Use specific UDP port"
 msgstr "特定の UDP ポートを使う"
 
+#~ msgid "Same IP is already in %s file."
+#~ msgstr "同じ IP が既に %s ファイルにあります。"
+
+#~ msgid ""
+#~ "drakfirewall configurator\n"
+#~ "\n"
+#~ "This configures a personal firewall for this Mageia machine.\n"
+#~ "For a powerful and dedicated firewall solution, please look to the\n"
+#~ "specialized Mageia Security Firewall distribution."
+#~ msgstr ""
+#~ "drakfirewall (ファイアウォール設定ツール)\n"
+#~ "\n"
+#~ "このツールは個人用ファイアウォールの設定を行います。\n"
+#~ "強力なファイアウォール専用ソリューションをお求めの場合は\n"
+#~ "Mageia Security Firewall をご利用ください。"
+
 #, fuzzy
 #~ msgid "Do you want to apply new wireless regulation settings now?"
 #~ msgstr "今接続を開始しますか？"