po: updated Japanese translation (rh #589230)

1 files changed, 716 insertions, 421 deletions

diff --git a/po/ja.po b/po/ja.po
index 7dc8ba50fc..dad755239c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-04-30 03:24+0000\n"
-"PO-Revision-Date: 2010-05-07 18:50+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-06 14:31+0530\n"
+"PO-Revision-Date: 2010-05-07 16:04+0900\n"
 "Last-Translator: Kiyoto Hashida <khashida@redhat.com>\n"
 "Language-Team: Japanese <jp@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,78 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
 "\n"
 "\n"
-"\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../cli/src/connections.c:86
+#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
+#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
+#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
+#: ../cli/src/devices.c:152
+msgid "NAME"
+msgstr "名前"
+
+#. 0
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+msgid "UUID"
+msgstr "UUID"
+
+#. 1
+#: ../cli/src/connections.c:61
+msgid "DEVICES"
+msgstr "デバイス"
+
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
+msgid "SCOPE"
+msgstr "範囲"
+
+#. 3
+#: ../cli/src/connections.c:63
+msgid "DEFAULT"
+msgstr "デフォルト"
+
+#. 4
+#: ../cli/src/connections.c:64
+msgid "DBUS-SERVICE"
+msgstr "DBUS-サービス"
+
+#. 5
+#: ../cli/src/connections.c:65
+msgid "SPEC-OBJECT"
+msgstr "スペックオブジェクト"
+
+#. 6
+#: ../cli/src/connections.c:66
+msgid "VPN"
+msgstr "VPN"
+
+#. 1
+#. 0
+#. 1
+#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+msgid "TYPE"
+msgstr "タイプ"
+
+#. 3
+#: ../cli/src/connections.c:78
+msgid "TIMESTAMP"
+msgstr "タイムスタンプ"
+
+#. 4
+#: ../cli/src/connections.c:79
+msgid "TIMESTAMP-REAL"
+msgstr "タイムスタンプ-リアル"
+
+#. 5
+#: ../cli/src/connections.c:80
+msgid "AUTOCONNECT"
+msgstr "自動接続"
+
+#. 6
+#: ../cli/src/connections.c:81
+msgid "READONLY"
+msgstr "読み込み専用"
+
+#: ../cli/src/connections.c:157
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -43,310 +111,514 @@ msgstr ""
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:158
-msgid "Connections"
-msgstr "接続"
+#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#, c-format
+msgid "Error: 'con list': %s"
+msgstr "エラー:'con list': %s"
 
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/devices.c:298 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Type"
-msgstr "タイプ"
+#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#, c-format
+msgid "Error: 'con list': %s; allowed fields: %s"
+msgstr "エラー:'con list': %s ; 許可されるフィールド: %s"
 
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/connections.c:207
+msgid "Connection details"
+msgstr "接続の詳細"
 
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Name"
-msgstr "名前"
+#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+msgid "system"
+msgstr "システム"
 
-#: ../cli/src/connections.c:163
-#, c-format
-msgid "System connections:\n"
-msgstr "システム接続:\n"
+#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+msgid "user"
+msgstr "ユーザー"
+
+#: ../cli/src/connections.c:383
+msgid "never"
+msgstr "しない"
+
+#. "CAPABILITIES"
+#. Print header
+#. "WIFI-PROPERTIES"
+#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
+#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
+#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
+#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
+#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
+#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
+#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
+#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
+#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
+#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
+#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
+#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
+#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
+#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
+#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
+#: ../cli/src/settings.c:1210
+msgid "yes"
+msgstr "はい"
 
-#: ../cli/src/connections.c:167
-#, c-format
-msgid "User connections:\n"
-msgstr "ユーザー接続:\n"
+#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
+#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
+#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
+#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
+#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
+#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
+#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
+#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
+#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
+#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
+#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
+#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
+#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
+#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
+#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
+#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
+#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+msgid "no"
+msgstr "いいえ"
+
+#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
+msgid "System connections"
+msgstr "システム接続"
+
+#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
+msgid "User connections"
+msgstr "ユーザー接続"
 
-#: ../cli/src/connections.c:178 ../cli/src/connections.c:967
-#: ../cli/src/connections.c:983 ../cli/src/connections.c:992
-#: ../cli/src/connections.c:1003 ../cli/src/connections.c:1085
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:614 ../cli/src/devices.c:699
-#: ../cli/src/devices.c:785 ../cli/src/devices.c:792
+#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
+#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
+#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
+#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
+#: ../cli/src/devices.c:980
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../cli/src/connections.c:189
+#: ../cli/src/connections.c:487
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "エラー: %s - そのような接続はありません。"
 
-#: ../cli/src/connections.c:196
-msgid "System-wide connections"
-msgstr "システム全域接続"
-
-#: ../cli/src/connections.c:205
-msgid "User connections"
-msgstr "ユーザー接続"
-
-#: ../cli/src/connections.c:212 ../cli/src/connections.c:1016
-#: ../cli/src/connections.c:1103 ../cli/src/devices.c:446
-#: ../cli/src/devices.c:494 ../cli/src/devices.c:628 ../cli/src/devices.c:706
-#: ../cli/src/devices.c:798
+#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
+#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
+#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメータ: %s\n"
 
-#: ../cli/src/connections.c:221
+#: ../cli/src/connections.c:528
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "エラー: 有効なパラメータが指定されていません。"
 
-#. FIXME: Fix the output
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:302
-#: ../cli/src/devices.c:321 ../cli/src/devices.c:353 ../cli/src/devices.c:355
-#: ../cli/src/devices.c:357 ../cli/src/devices.c:359 ../cli/src/devices.c:361
-msgid "yes"
-msgstr "はい"
+#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
+#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#, c-format
+msgid "Error: %s."
+msgstr "エラー: %s"
 
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:304
-msgid "no"
-msgstr "いいえ"
+#: ../cli/src/connections.c:649
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "エラー: 'con status': %s"
 
-#: ../cli/src/connections.c:297
+#: ../cli/src/connections.c:651
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "エラー: 'con status': %s ; 許可されるフィールド: %s"
+
+#: ../cli/src/connections.c:658
 msgid "Active connections"
 msgstr "アクティブな接続"
 
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-#: ../cli/src/devices.c:302 ../cli/src/devices.c:304
-msgid "Default"
-msgstr "デフォルト"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Service"
-msgstr "サービス"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Devices"
-msgstr "デバイス"
-
-#: ../cli/src/connections.c:659
+#: ../cli/src/connections.c:1026
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s'上にアクティブな接続がありません"
 
-#: ../cli/src/connections.c:667
+#: ../cli/src/connections.c:1034
 #, c-format
 msgid "no active connection or device"
 msgstr "アクティブな接続、又はデバイスがありません"
 
-#: ../cli/src/connections.c:730
+#: ../cli/src/connections.c:1084
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
+
+#: ../cli/src/connections.c:1086
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "接続 '%s'用のデバイスが見付かりません"
+
+#: ../cli/src/connections.c:1097
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../cli/src/connections.c:732
+#: ../cli/src/connections.c:1099
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../cli/src/connections.c:735 ../cli/src/connections.c:758
-#: ../cli/src/connections.c:791 ../cli/src/devices.c:111
-#: ../cli/src/network-manager.c:76 ../cli/src/network-manager.c:98
+#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
+#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
+#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
+#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
 msgid "unknown"
 msgstr "不明"
 
-#: ../cli/src/connections.c:744
+#: ../cli/src/connections.c:1111
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続（準備）"
 
-#: ../cli/src/connections.c:746
+#: ../cli/src/connections.c:1113
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続（認証が必要）"
 
-#: ../cli/src/connections.c:748
+#: ../cli/src/connections.c:1115
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../cli/src/connections.c:750
+#: ../cli/src/connections.c:1117
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続（IP 設定を取得）"
 
-#: ../cli/src/connections.c:752
+#: ../cli/src/connections.c:1119
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../cli/src/connections.c:754
+#: ../cli/src/connections.c:1121
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../cli/src/connections.c:756
+#: ../cli/src/connections.c:1123
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../cli/src/connections.c:767
+#: ../cli/src/connections.c:1134
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../cli/src/connections.c:769
+#: ../cli/src/connections.c:1136
 msgid "none"
 msgstr "なし"
 
-#: ../cli/src/connections.c:771
+#: ../cli/src/connections.c:1138
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../cli/src/connections.c:773
+#: ../cli/src/connections.c:1140
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../cli/src/connections.c:775
+#: ../cli/src/connections.c:1142
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../cli/src/connections.c:777
+#: ../cli/src/connections.c:1144
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../cli/src/connections.c:779
+#: ../cli/src/connections.c:1146
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../cli/src/connections.c:781
+#: ../cli/src/connections.c:1148
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../cli/src/connections.c:783
+#: ../cli/src/connections.c:1150
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../cli/src/connections.c:785
+#: ../cli/src/connections.c:1152
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../cli/src/connections.c:787
+#: ../cli/src/connections.c:1154
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../cli/src/connections.c:789
+#: ../cli/src/connections.c:1156
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../cli/src/connections.c:803
+#: ../cli/src/connections.c:1170
 #, c-format
 msgid "state: %s\n"
 msgstr "状態: %s\n"
 
-#: ../cli/src/connections.c:806 ../cli/src/connections.c:832
+#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
 #, c-format
 msgid "Connection activated\n"
 msgstr "接続はアクティベート済み\n"
 
-#: ../cli/src/connections.c:809
+#: ../cli/src/connections.c:1176
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "エラー: 接続のアクティベーションに失敗"
 
-#: ../cli/src/connections.c:828
+#: ../cli/src/connections.c:1195
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "状態: %s (%d)\n"
 
-#: ../cli/src/connections.c:838
+#: ../cli/src/connections.c:1205
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "エラー: 接続のアクティベーションに失敗: %s."
 
-#: ../cli/src/connections.c:855 ../cli/src/devices.c:551
+#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../cli/src/connections.c:898
+#: ../cli/src/connections.c:1265
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../cli/src/connections.c:912
+#: ../cli/src/connections.c:1279
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "エラー: '%s'用のアクティブ接続の取得に失敗"
 
-#: ../cli/src/connections.c:921
+#: ../cli/src/connections.c:1288
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "アクティブ接続の状態: %s\n"
 
-#: ../cli/src/connections.c:922
+#: ../cli/src/connections.c:1289
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "アクティブ接続のパス: %s\n"
 
-#: ../cli/src/connections.c:976 ../cli/src/connections.c:1094
+#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "エラー: 不明な接続: %s"
 
-#: ../cli/src/connections.c:1011 ../cli/src/devices.c:622
+#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "エラー: 制限時間値の '%s' は有効でありません"
 
-#: ../cli/src/connections.c:1024 ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "エラー: id か又は uuid の指定が必要です"
 
-#: ../cli/src/connections.c:1044
+#: ../cli/src/connections.c:1411
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "エラー: 適切なデバイスが見付かりません: %s"
 
-#: ../cli/src/connections.c:1046
+#: ../cli/src/connections.c:1413
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "エラー: 適切なデバイスが見付かりません"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1505
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "警告: 接続はアクティブでありません\n"
 
-#: ../cli/src/connections.c:1189
+#: ../cli/src/connections.c:1561
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "エラー: 'con' コマンド '%s' は有効ではありません"
 
-#: ../cli/src/connections.c:1216
+#: ../cli/src/connections.c:1597
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "エラー: D-Bus に接続できませんでした"
 
-#: ../cli/src/connections.c:1223
+#: ../cli/src/connections.c:1604
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "エラー: システム設定を取得できませんでした"
 
-#: ../cli/src/connections.c:1231
+#: ../cli/src/connections.c:1612
 #, c-format
 msgid "Error: Could not get user settings."
 msgstr "エラー: ユーザー設定を取得できませんでした"
 
-#: ../cli/src/connections.c:1241
+#: ../cli/src/connections.c:1622
 #, c-format
 msgid "Error: Can't obtain connections: settings services are not running."
 msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません"
 
+#. 0
+#. 9
+#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+msgid "DEVICE"
+msgstr "デバイス"
+
+#. 1
+#. 4
+#. 0
+#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#: ../cli/src/network-manager.c:36
+msgid "STATE"
+msgstr "状態"
+
+#: ../cli/src/devices.c:71
+msgid "GENERAL"
+msgstr "全般"
+
+#. 0
+#: ../cli/src/devices.c:72
+msgid "CAPABILITIES"
+msgstr "能力"
+
+#. 1
 #: ../cli/src/devices.c:73
+msgid "WIFI-PROPERTIES"
+msgstr "WIFI-プロパティ"
+
+#. 2
+#: ../cli/src/devices.c:74
+msgid "AP"
+msgstr "AP"
+
+#. 3
+#: ../cli/src/devices.c:75
+msgid "WIRED-PROPERTIES"
+msgstr "有線接続-プロパティ"
+
+#. 4
+#: ../cli/src/devices.c:76
+msgid "IP4-SETTINGS"
+msgstr "IP4-セッティング"
+
+#. 5
+#: ../cli/src/devices.c:77
+msgid "IP4-DNS"
+msgstr "IP4-DNS"
+
+#. 2
+#: ../cli/src/devices.c:88
+msgid "DRIVER"
+msgstr "ドライバー"
+
+#. 3
+#: ../cli/src/devices.c:89
+msgid "HWADDR"
+msgstr "HWADDR"
+
+#. 0
+#: ../cli/src/devices.c:99
+msgid "CARRIER-DETECT"
+msgstr "キャリア検出"
+
+#. 1
+#: ../cli/src/devices.c:100
+msgid "SPEED"
+msgstr "速度"
+
+#. 0
+#: ../cli/src/devices.c:109
+msgid "CARRIER"
+msgstr "キャリア"
+
+#. 0
+#: ../cli/src/devices.c:119
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:120
+msgid "WPA"
+msgstr "WPA"
+
+#. 2
+#: ../cli/src/devices.c:121
+msgid "WPA2"
+msgstr "WPA2"
+
+#. 3
+#: ../cli/src/devices.c:122
+msgid "TKIP"
+msgstr "TKIP"
+
+#. 4
+#: ../cli/src/devices.c:123
+msgid "CCMP"
+msgstr "CCMP"
+
+#. 0
+#: ../cli/src/devices.c:132
+msgid "ADDRESS"
+msgstr "アドレス"
+
+#. 1
+#: ../cli/src/devices.c:133
+msgid "PREFIX"
+msgstr "接頭辞"
+
+#. 2
+#: ../cli/src/devices.c:134
+msgid "GATEWAY"
+msgstr "ゲートウェイ"
+
+#. 0
+#: ../cli/src/devices.c:143
+msgid "DNS"
+msgstr "DNS"
+
+#. 0
+#: ../cli/src/devices.c:153
+msgid "SSID"
+msgstr "SSID"
+
+#. 1
+#: ../cli/src/devices.c:154
+msgid "BSSID"
+msgstr "BSSID"
+
+#. 2
+#: ../cli/src/devices.c:155
+msgid "MODE"
+msgstr "モード"
+
+#. 3
+#: ../cli/src/devices.c:156
+msgid "FREQ"
+msgstr "周波数"
+
+#. 4
+#: ../cli/src/devices.c:157
+msgid "RATE"
+msgstr "レート"
+
+#. 5
+#: ../cli/src/devices.c:158
+msgid "SIGNAL"
+msgstr "信号"
+
+#. 6
+#: ../cli/src/devices.c:159
+msgid "SECURITY"
+msgstr "セキュリティ"
+
+#. 7
+#: ../cli/src/devices.c:160
+msgid "WPA-FLAGS"
+msgstr "WPA-フラグ"
+
+#. 8
+#: ../cli/src/devices.c:161
+msgid "RSN-FLAGS"
+msgstr "RSN-フラグ"
+
+#. 10
+#: ../cli/src/devices.c:163
+msgid "ACTIVE"
+msgstr "アクティブ"
+
+#: ../cli/src/devices.c:186
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -356,7 +628,7 @@ msgid ""
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
 "\n"
 msgstr ""
 "使用法: nmcli dev { COMMAND | help }\n"
@@ -366,349 +638,236 @@ msgstr ""
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:93
+#: ../cli/src/devices.c:206
 msgid "unmanaged"
 msgstr "管理無し"
 
-#: ../cli/src/devices.c:95
+#: ../cli/src/devices.c:208
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../cli/src/devices.c:97 ../cli/src/network-manager.c:73
+#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
 msgid "disconnected"
 msgstr "切断済み"
 
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:212
 msgid "connecting (prepare)"
 msgstr "接続中（準備）"
 
-#: ../cli/src/devices.c:101
+#: ../cli/src/devices.c:214
 msgid "connecting (configuring)"
 msgstr "接続中（設定中）"
 
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:216
 msgid "connecting (need authentication)"
 msgstr "接続中（認証が必要）"
 
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:218
 msgid "connecting (getting IP configuration)"
 msgstr "接続中（IP 設定を取得中）"
 
-#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:71
+#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
 msgid "connected"
 msgstr "接続済み"
 
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:222
 msgid "connection failed"
 msgstr "接続に失敗"
 
-#: ../cli/src/devices.c:132 ../cli/src/devices.c:876
+#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
 msgid "Unknown"
 msgstr "不明"
 
-#. print them
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:266 ../cli/src/devices.c:861
-#: ../cli/src/devices.c:879
+#: ../cli/src/devices.c:277
 msgid "(none)"
 msgstr "（なし）"
 
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:302
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: IP4 アドレス 0x%X を変換中にエラー発生"
 
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:349
 #, c-format
-msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
-msgstr "%s, %s, 周波数 %d MHz, レート %d Mb/s, 強さ %d"
-
-#: ../cli/src/devices.c:239
-msgid "Ad-Hoc"
-msgstr "アドホック"
-
-#: ../cli/src/devices.c:248
-msgid ", Encrypted: "
-msgstr ", 暗号化:"
-
-#: ../cli/src/devices.c:253
-msgid " WEP"
-msgstr " WEP"
-
-#: ../cli/src/devices.c:255
-msgid " WPA"
-msgstr " WPA"
-
-#: ../cli/src/devices.c:257
-msgid " WPA2"
-msgstr " WPA2"
+msgid "%u MHz"
+msgstr "%u MHz"
 
-#: ../cli/src/devices.c:260
-msgid " Enterprise"
-msgstr " Enterprise"
+#: ../cli/src/devices.c:350
+#, c-format
+msgid "%u MB/s"
+msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:294 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Device"
-msgstr "デバイス"
+#: ../cli/src/devices.c:359
+msgid "Encrypted: "
+msgstr "暗号化:"
 
-#: ../cli/src/devices.c:299
-msgid "Driver"
-msgstr "ドライバー"
+#: ../cli/src/devices.c:364
+msgid "WEP "
+msgstr "WEP "
 
-#: ../cli/src/devices.c:299 ../cli/src/devices.c:567
-msgid "(unknown)"
-msgstr "(不明)"
+#: ../cli/src/devices.c:366
+msgid "WPA "
+msgstr "WPA "
 
-#: ../cli/src/devices.c:300 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "State"
-msgstr "状態"
+#: ../cli/src/devices.c:368
+msgid "WPA2 "
+msgstr "WPA2 "
 
-#: ../cli/src/devices.c:313
-msgid "HW Address"
-msgstr "HW アドレス"
+#: ../cli/src/devices.c:371
+msgid "Enterprise "
+msgstr "Enterprise "
 
-#: ../cli/src/devices.c:319
-#, c-format
-msgid ""
-"\n"
-"  Capabilities:\n"
-msgstr ""
-"\n"
-"  能力:\n"
+#: ../cli/src/devices.c:380
+msgid "Ad-Hoc"
+msgstr "アドホック"
 
-#: ../cli/src/devices.c:321
-msgid "Carrier Detect"
-msgstr "キャリア検出"
+#: ../cli/src/devices.c:380
+msgid "Infrastructure"
+msgstr "インフラストラクチャ"
 
-#: ../cli/src/devices.c:336
+#: ../cli/src/devices.c:442
 #, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
+msgid "Error: 'dev list': %s"
+msgstr "エラー: 'dev list': %s"
 
-#: ../cli/src/devices.c:337
-msgid "Speed"
-msgstr "速度"
-
-#: ../cli/src/devices.c:348
+#: ../cli/src/devices.c:444
 #, c-format
-msgid ""
-"\n"
-"  Wireless Properties\n"
-msgstr ""
-"\n"
-"  無線接続のプロパティ\n"
-
-#: ../cli/src/devices.c:353
-msgid "WEP Encryption"
-msgstr "WEP 暗号化"
-
-#: ../cli/src/devices.c:355
-msgid "WPA Encryption"
-msgstr "WPA 暗号化"
+msgid "Error: 'dev list': %s; allowed fields: %s"
+msgstr "エラー: 'dev list': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/devices.c:357
-msgid "WPA2 Encryption"
-msgstr "WPA2 暗号化"
+#: ../cli/src/devices.c:453
+msgid "Device details"
+msgstr "デバイスの詳細"
 
-#: ../cli/src/devices.c:359
-msgid "TKIP cipher"
-msgstr "TKIP 暗号"
-
-#: ../cli/src/devices.c:361
-msgid "CCMP cipher"
-msgstr "CCMP 暗号"
-
-#: ../cli/src/devices.c:368
-#, c-format
-msgid ""
-"\n"
-"  Wireless Access Points %s\n"
-msgstr ""
-"\n"
-"  無線アクセスポイント %s\n"
+#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+msgid "(unknown)"
+msgstr "(不明)"
 
-#: ../cli/src/devices.c:368
-msgid "(* = current AP)"
-msgstr "(* = 現在の AP)"
+#: ../cli/src/devices.c:484
+msgid "unknown)"
+msgstr "不明)"
 
-#: ../cli/src/devices.c:374
+#: ../cli/src/devices.c:510
 #, c-format
-msgid ""
-"\n"
-"  Wired Properties\n"
-msgstr ""
-"\n"
-"  有線接続のプロパティ\n"
-
-#: ../cli/src/devices.c:377 ../cli/src/devices.c:379
-msgid "Carrier"
-msgstr "キャリア"
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
 
-#: ../cli/src/devices.c:377
+#. Print header
+#. "WIRED-PROPERTIES"
+#: ../cli/src/devices.c:583
 msgid "on"
 msgstr "オン"
 
-#: ../cli/src/devices.c:379
+#: ../cli/src/devices.c:583
 msgid "off"
 msgstr "オフ"
 
-#: ../cli/src/devices.c:387
+#: ../cli/src/devices.c:710
 #, c-format
-msgid ""
-"\n"
-"  IPv4 Settings:\n"
-msgstr ""
-"\n"
-"  IPv4 セッティング:\n"
-
-#: ../cli/src/devices.c:395
-msgid "Address"
-msgstr "アドレス"
-
-#: ../cli/src/devices.c:401
-msgid "Prefix"
-msgstr "接頭辞"
+msgid "Error: 'dev status': %s"
+msgstr "エラー: 'dev status': %s"
 
-#: ../cli/src/devices.c:405
-msgid "Gateway"
-msgstr "ゲートウェイ"
-
-#: ../cli/src/devices.c:416
-msgid "DNS"
-msgstr "DNS"
+#: ../cli/src/devices.c:712
+#, c-format
+msgid "Error: 'dev status': %s; allowed fields: %s"
+msgstr "エラー: 'dev status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/devices.c:458
+#: ../cli/src/devices.c:719
 msgid "Status of devices"
 msgstr "デバイスのステータス"
 
-#: ../cli/src/devices.c:487
+#: ../cli/src/devices.c:747
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../cli/src/devices.c:516 ../cli/src/devices.c:655 ../cli/src/devices.c:729
+#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見付かりません"
 
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:799
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "成功: デバイス '%s' は正常に切断されました。"
 
-#: ../cli/src/devices.c:564
+#: ../cli/src/devices.c:824
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
 
-#: ../cli/src/devices.c:572
+#: ../cli/src/devices.c:832
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "デバイスの状態: %d (%s)\n"
 
-#: ../cli/src/devices.c:636
+#: ../cli/src/devices.c:896
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "エラー: iface を指定する必要があります。"
 
-#: ../cli/src/devices.c:736 ../cli/src/devices.c:746
-msgid "WiFi scan list"
-msgstr "WiFi スキャン一覧"
-
-#: ../cli/src/devices.c:740
+#: ../cli/src/devices.c:1011
 #, c-format
-msgid "Error: Device '%s' is not a WiFi device."
-msgstr "エラー: デバイス '%s' は WiFi デバイスではありません。"
+msgid "Error: 'dev wifi': %s"
+msgstr "エラー: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:754
-msgid "Device:"
-msgstr "デバイス:"
-
-#: ../cli/src/devices.c:806
+#: ../cli/src/devices.c:1013
 #, c-format
-msgid "Error: hwaddr has to be specified."
-msgstr "エラー: hwaddr を指定する必要があります。"
+msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgstr "エラー: 'dev wifi': %s; 許可されるフィールド: %s"
+
+#: ../cli/src/devices.c:1020
+msgid "WiFi scan list"
+msgstr "WiFi スキャン一覧"
 
-#: ../cli/src/devices.c:844
+#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
 msgstr "エラー: hwaddr '%s' のアクセスポイントが見付かりません"
 
-#: ../cli/src/devices.c:862
-#, c-format
-msgid "%u MHz"
-msgstr "%u MHz"
-
-#: ../cli/src/devices.c:863
+#: ../cli/src/devices.c:1072
 #, c-format
-msgid "%u MB/s"
-msgstr "%u MB/s"
-
-#: ../cli/src/devices.c:869 ../cli/src/devices.c:871
-msgid "AP parameters"
-msgstr "AP パラメータ"
-
-#: ../cli/src/devices.c:873
-msgid "SSID:"
-msgstr "SSID:"
-
-#: ../cli/src/devices.c:874
-msgid "BSSID:"
-msgstr "BSSID:"
-
-#: ../cli/src/devices.c:875
-msgid "Frequency:"
-msgstr "周波数:"
-
-#: ../cli/src/devices.c:876
-msgid "Mode:"
-msgstr "モード:"
-
-#: ../cli/src/devices.c:876
-msgid "Ad-hoc"
-msgstr "アドホック"
-
-#: ../cli/src/devices.c:876
-msgid "Infrastructure"
-msgstr "インフラストラクチャ"
-
-#: ../cli/src/devices.c:877
-msgid "Maximal bitrate:"
-msgstr "最大ビットレート:"
-
-#: ../cli/src/devices.c:878
-msgid "Strength:"
-msgstr "強さ:"
-
-#: ../cli/src/devices.c:879
-msgid "Flags:"
-msgstr "フラグ:"
-
-#: ../cli/src/devices.c:879
-msgid "privacy"
-msgstr "プライバシー"
-
-#: ../cli/src/devices.c:880
-msgid "WPA flags:"
-msgstr "WPA フラグ:"
-
-#: ../cli/src/devices.c:881
-msgid "RSN flags:"
-msgstr "RSN フラグ:"
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "エラー: デバイス '%s' は WiFi デバイスではありません。"
 
-#: ../cli/src/devices.c:907
+#: ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "エラー: 'dev wifi' コマンド '%s' は無効です。"
 
-#: ../cli/src/devices.c:943
+#: ../cli/src/devices.c:1183
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "エラー: 'dev' コマンド '%s' は無効です。"
 
-#: ../cli/src/network-manager.c:46
+#: ../cli/src/network-manager.c:35
+msgid "RUNNING"
+msgstr "実行中"
+
+#. 1
+#: ../cli/src/network-manager.c:37
+msgid "WIFI-HARDWARE"
+msgstr "WIFI ハードウェア"
+
+#. 2
+#: ../cli/src/network-manager.c:38
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 3
+#: ../cli/src/network-manager.c:39
+msgid "WWAN-HARDWARE"
+msgstr "WWAN ハードウェア"
+
+#. 4
+#: ../cli/src/network-manager.c:40
+msgid "WWAN"
+msgstr "WWAN"
+
+#: ../cli/src/network-manager.c:62
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
@@ -733,89 +892,91 @@ msgstr ""
 "  wwan [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:83
 msgid "asleep"
 msgstr "休止中"
 
-#: ../cli/src/network-manager.c:69
+#: ../cli/src/network-manager.c:85
 msgid "connecting"
 msgstr "接続中"
 
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "enabled"
-msgstr "有効"
+#: ../cli/src/network-manager.c:125
+#, c-format
+msgid "Error: 'nm status': %s"
+msgstr "エラー: 'nm status': %s"
 
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "disabled"
-msgstr "無効"
+#: ../cli/src/network-manager.c:127
+#, c-format
+msgid "Error: 'nm status': %s; allowed fields: %s"
+msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:134
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../cli/src/network-manager.c:104
-msgid "NM running:"
-msgstr "NM が実行中:"
+#. Print header
+#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
+#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
+#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgid "enabled"
+msgstr "有効"
+
+#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
+#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
+#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgid "disabled"
+msgstr "無効"
 
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:148
 msgid "running"
 msgstr "実行中"
 
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:148
 msgid "not running"
 msgstr "実行していません"
 
-#: ../cli/src/network-manager.c:105
-msgid "NM state:"
-msgstr "NM の状態: "
-
-#: ../cli/src/network-manager.c:106
-msgid "NM wireless hardware:"
-msgstr "NM ワイヤレスハードウェア:"
-
-#. no argument, show current state
-#: ../cli/src/network-manager.c:107 ../cli/src/network-manager.c:143
-msgid "NM wireless:"
-msgstr "NM ワイヤレス:"
-
-#: ../cli/src/network-manager.c:108
-msgid "NM WWAN hardware:"
-msgstr "NM WWAN ハードウェア:"
+#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#, c-format
+msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+msgstr "エラー: '--fields' の値 '%s' はここでは有効ではありません; 許可されるフィールド: %s"
 
-#. no argument, show current state
-#: ../cli/src/network-manager.c:109 ../cli/src/network-manager.c:160
-msgid "NM WWAN:"
-msgstr "NM WWAN:"
+#: ../cli/src/network-manager.c:209
+msgid "WiFi enabled"
+msgstr "WiFi は有効です"
 
-#: ../cli/src/network-manager.c:150
+#: ../cli/src/network-manager.c:220
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
 msgstr "エラー: 無効な'wifi' パラメータ: '%s'"
 
-#: ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:241
+msgid "WWAN enabled"
+msgstr "WWAN は有効です"
+
+#: ../cli/src/network-manager.c:252
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
 msgstr "エラー: 無効な'wwan' パラメータ: '%s'"
 
-#: ../cli/src/network-manager.c:178
+#: ../cli/src/network-manager.c:263
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "エラー: 'nm' コマンド '%s' は無効です。"
 
-#: ../cli/src/nmcli.c:65
+#: ../cli/src/nmcli.c:69
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -t[erse]    terse output\n"
-"  -p[retty]   pretty output\n"
-"  -v[ersion]  show program version\n"
-"  -h[elp]     print this help\n"
+"  -t[erse]                                   terse output\n"
+"  -p[retty]                                  pretty output\n"
+"  -m[ode] tabular|multiline                  output mode\n"
+"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
+"  -e[scape] yes|no                           escape columns separators in "
+"values\n"
+"  -v[ersion]                                 show program version\n"
+"  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
 "  nm          NetworkManager status\n"
@@ -826,10 +987,14 @@ msgstr ""
 "使用法: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -t[erse]    terse output\n"
-"  -p[retty]   pretty output\n"
-"  -v[ersion]  show program version\n"
-"  -h[elp]     print this help\n"
+"  -t[erse]                                   terse output\n"
+"  -p[retty]                                  pretty output\n"
+"  -m[ode] tabular|multiline                  output mode\n"
+"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
+"  -e[scape] yes|no                           escape columns separators in "
+"values\n"
+"  -v[ersion]                                 show program version\n"
+"  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
 "  nm          NetworkManager status\n"
@@ -837,35 +1002,165 @@ msgstr ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:106
+#: ../cli/src/nmcli.c:113
+#, c-format
+msgid "Error: Object '%s' is unknown, try 'nmcli help'."
+msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を試して下さい。"
+
+#: ../cli/src/nmcli.c:143
+#, c-format
+msgid "Error: Option '--terse' is specified the second time."
+msgstr "エラー: オプション '--terse' は２回目の指定です。"
+
+#: ../cli/src/nmcli.c:148
+#, c-format
+msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
+msgstr "エラー: オプション '--terse' は '--pretty' と相互に独占的です。"
+
+#: ../cli/src/nmcli.c:156
+#, c-format
+msgid "Error: Option '--pretty' is specified the second time."
+msgstr "エラー: オプション '--pretty' は２回目の指定です。"
+
+#: ../cli/src/nmcli.c:161
+#, c-format
+msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
+msgstr "エラー: オプション '--pretty' は '--terse' と相互に独占的です。"
+
+#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#, c-format
+msgid "Error: missing argument for '%s' option."
+msgstr "エラー: %s オプション用の引数がありません。"
+
+#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
 #, c-format
-msgid "Object '%s' is unknown, try 'nmcli help'."
-msgstr "オブジェクト'%s' は不明です。'nmcli help' を試して下さい。"
+msgid "Error: '%s' is not valid argument for '%s' option."
+msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:203
+#, c-format
+msgid "Error: fields for '%s' options are missing."
+msgstr "エラー: '%s' オプション用のフィールドがありません。"
+
+#: ../cli/src/nmcli.c:209
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../cli/src/nmcli.c:145
+#: ../cli/src/nmcli.c:215
 #, c-format
-msgid "Option '%s' is unknown, try 'nmcli -help'."
-msgstr "オプション '%s' は不明です、'nmcli -help' を試して下さい。"
+msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
+msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を試して下さい。"
 
-#: ../cli/src/nmcli.c:164
+#: ../cli/src/nmcli.c:234
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "シグナル %d が出ました、シャットダウンします..."
 
-#: ../cli/src/nmcli.c:189
+#: ../cli/src/nmcli.c:259
 #, c-format
 msgid "Error: Could not connect to NetworkManager."
 msgstr "エラー: NetworkManager へ接続出来ませんでした。"
 
-#: ../cli/src/nmcli.c:205
+#: ../cli/src/nmcli.c:275
 msgid "Success"
 msgstr "成功"
 
+#: ../cli/src/settings.c:407
+#, c-format
+msgid "%d (hex-ascii-key)"
+msgstr "%d (hex-ascii-key)"
+
+#: ../cli/src/settings.c:409
+#, c-format
+msgid "%d (104/128-bit passphrase)"
+msgstr "%d (104/128-bit パスフレーズ)"
+
+#: ../cli/src/settings.c:412
+#, c-format
+msgid "%d (unknown)"
+msgstr "%d (不明)"
+
+#: ../cli/src/settings.c:438
+msgid "0 (unknown)"
+msgstr "0 (不明)"
+
+#: ../cli/src/settings.c:444
+msgid "any, "
+msgstr "いずれでも、"
+
+#: ../cli/src/settings.c:446
+msgid "900 MHz, "
+msgstr "900 MHz, "
+
+#: ../cli/src/settings.c:448
+msgid "1800 MHz, "
+msgstr "1800 MHz, "
+
+#: ../cli/src/settings.c:450
+msgid "1900 MHz, "
+msgstr "1900 MHz, "
+
+#: ../cli/src/settings.c:452
+msgid "850 MHz, "
+msgstr "850 MHz, "
+
+#: ../cli/src/settings.c:454
+msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 2100 MHz, "
+
+#: ../cli/src/settings.c:456
+msgid "WCDMA 3GPP UMTS 1800 MHz, "
+msgstr "WCDMA 3GPP UMTS 1800 MHz, "
+
+#: ../cli/src/settings.c:458
+msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
+
+#: ../cli/src/settings.c:460
+msgid "WCDMA 3GPP UMTS 800 MHz, "
+msgstr "WCDMA 3GPP UMTS 800 MHz, "
+
+#: ../cli/src/settings.c:462
+msgid "WCDMA 3GPP UMTS 850 MHz, "
+msgstr "WCDMA 3GPP UMTS 850 MHz, "
+
+#: ../cli/src/settings.c:464
+msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgstr "WCDMA 3GPP UMTS 900 MHz, "
+
+#: ../cli/src/settings.c:466
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+msgid "auto"
+msgstr "自動"
+
+#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+msgid "not set"
+msgstr "セットされていません"
+
+#: ../cli/src/utils.c:124
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "フィールド '%s' は孤立する必要があります"
+
+#: ../cli/src/utils.c:127
+#, c-format
+msgid "invalid field '%s'"
+msgstr "無効なフィールド  '%s'"
+
+#: ../cli/src/utils.c:146
+#, c-format
+msgid "Option '--terse' requires specifying '--fields'"
+msgstr "オプション '--terse' には '--fields' の指定が必要です"
+
+#: ../cli/src/utils.c:150
+#, c-format
+msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' ではありません"
+
 #: ../libnm-util/crypto.c:120
 #, c-format
 msgid "PEM key file had no end tag '%s'."
@@ -1181,26 +1476,26 @@ msgstr "PKCS#12 ファイルを確証出来ません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-util/nm-utils.c:1924
+#: ../libnm-util/nm-utils.c:1925
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "暗号化キーを作成するのに十分なメモリーがありません。"
 
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2035
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ファイル作成用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2046
+#: ../libnm-util/nm-utils.c:2047
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ファイルへの IV の書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2058
+#: ../libnm-util/nm-utils.c:2059
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "PEM ファイルへの暗号化キーの書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2077
+#: ../libnm-util/nm-utils.c:2078
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM ファイルデータ用にメモリーを割り当て出来ません。"
@@ -1308,7 +1603,7 @@ msgstr "以下の一覧にあるネームサーバーは認識されないかも
 msgid "Auto %s"
 msgstr "自動 %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3254
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
 msgid "System"
 msgstr "システム"