about summary refs log tree commit diff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/gl.po2
-rw-r--r--po/hr.po2
-rw-r--r--po/ja.po4501
-rw-r--r--po/or.po2
-rw-r--r--po/pl.po1090
6 files changed, 4423 insertions, 1175 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f261d0b..f8b4b091 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,6 +14,7 @@ libnm-util/crypto_nss.c
 libnm-util/nm-utils.c
 policy/org.freedesktop.NetworkManager.policy.in.in
 src/main.c
+src/bluez-manager/nm-bluez-device.c
 src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-dhclient-utils.c
 src/dhcp-manager/nm-dhcp-manager.c
diff --git a/po/gl.po b/po/gl.po
index f9a9e31d..5131f2b9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1964,7 +1964,7 @@ msgstr "LOOSE_BINDING, "
 #, c-format
 #| msgid "disabled"
 msgid "%d (disabled)"
-msgstr "0 (desactivado)"
+msgstr "%d (desactivado)"
 
 #: ../cli/src/settings.c:692
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index 1d0b4676..4e245654 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -882,7 +882,7 @@ msgstr "Greška: 'dev status': %s"
 #: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Greška: 'dev status': s; dozvoljena polja: %s"
+msgstr "Greška: 'dev status': %s; dozvoljena polja: %s"
 
 #: ../cli/src/devices.c:1029
 msgid "Status of devices"
diff --git a/po/ja.po b/po/ja.po
index 37f0e829..a57bfe5e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,969 +2,1806 @@
 # Japanese translation for NetworkManager
 # Copyright (C) 2005 Dan Williams <dcbw@redhat.com>
 # This file is distributed under the same license as the NetworkManager package.
-#
 # Satoru SATOH <ssato@redhat.com>, 2005-2007.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
+# Noriko Mizumoto <noriko@fedoraproject.org>, 2013.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: ja\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"
+"Project-Id-Version: NetworkManager\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-09-23 12:01+0900\n"
+"PO-Revision-Date: 2013-09-17 10:09+0000\n"
+"Last-Translator: Noriko Mizumoto <noriko@fedoraproject.org>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
-"\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../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 "名前"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
+msgid "GROUP"
+msgstr "グループ"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "アドレス"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "デバイス"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ルート"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "範囲"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "デフォルト"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ドメイン"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-サービス"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
 
-#. 5
-#: ../cli/src/connections.c:65
-msgid "SPEC-OBJECT"
-msgstr "スペックオブジェクト"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "オプション"
 
-#. 6
-#: ../cli/src/connections.c:66
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "管理無し"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "利用不可"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "切断済み"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "接続中(準備)"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "接続中(設定中)"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "接続中(認証が必要)"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "接続中(IP 設定を取得中)"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "接続中(IP の接続性チェック)"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "接続中(セカンダリ接続を開始)"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "接続済み"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:466
+msgid "deactivating"
+msgstr "停止中"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "接続に失敗"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:471
+#: ../cli/src/connections.c:494 ../cli/src/connections.c:1189
+#: ../cli/src/devices.c:664 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533
+#: ../src/main.c:435 ../src/main.c:454
+msgid "unknown"
+msgstr "不明"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "原因不明"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "不明なエラー"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "デバイスが管理下に置かれました"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "デバイスが管理下から外れました"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "デバイスの設定準備ができませんでした"
+
+#: ../cli/src/common.c:414
+msgid "IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "この IP 設定は無効になりました"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "秘密が必要でしたが入力されませんでした"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X サプリカントが切断されました"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X サプリカントの設定に失敗しました"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X サプリカントが失敗しました"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP サービスの接続が切断されました"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP の失敗"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP クライアントの開始に失敗しました"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP クライアントエラー"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP クライアントの失敗"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "共有接続サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "共有接続サービスの失敗"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP サービスエラー"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP サービスの失敗"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "回線が使用中です"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ダイアル音がありません"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "確立できるキャリアがありませんでした"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ダイアル要求がタイムアウトしました"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ダイアルの試行に失敗しました"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "モデムの初期化に失敗しました"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "指定された APN の選択に失敗しました"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr ""
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "ネットワークの登録が拒否されました"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "ネットワークの登録がタイムアウトしました"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "要求されたネットワークへの登録に失敗しました"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN 確認に失敗しました"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "このデバイスに必要なファームウェアがない可能性があります"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "このデバイスは削除されました"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager がスリープ状態に入りました"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "このデバイスのアクティブな接続が消滅しました"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "キャリア/リンクが変更されました"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr ""
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "サプリカントが使用できるようになりました"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "モデムが見つかりませんでした"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM モデムの SIM カードが挿入されていません"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM モデムの SIM PIN が必要です"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM モデムの SIM PUK が必要です"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM モデムの SIM が間違っています"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand デバイスでは接続モードに対応していません"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "接続依存性の失敗"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager は使用できません"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi ネットワークが見つかりませんでした"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "ベース接続のセカンダリ接続に失敗しました"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:310 ../cli/src/devices.c:328
+#: ../cli/src/devices.c:450 ../cli/src/devices.c:494
+msgid "Unknown"
+msgstr "不明"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:109 ../cli/src/devices.c:134 ../cli/src/devices.c:144
+#: ../cli/src/devices.c:154 ../cli/src/devices.c:164 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:194 ../cli/src/devices.c:216 ../cli/src/devices.c:232
+#: ../cli/src/devices.c:241
+msgid "NAME"
+msgstr "名前"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:111 ../cli/src/devices.c:219
 msgid "TYPE"
 msgstr "タイプ"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#. 13
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:123
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "読み込み専用"
 
-#: ../cli/src/connections.c:157
-#, c-format
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:206 ../cli/src/devices.c:222
+msgid "DBUS-PATH"
+msgstr "DBUS パス"
+
+#. 2
+#: ../cli/src/connections.c:136
+msgid "DEVICES"
+msgstr "デバイス"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:118 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "状態"
+
+#. 4
+#: ../cli/src/connections.c:138
+msgid "DEFAULT"
+msgstr "デフォルト"
+
+#. 5
+#: ../cli/src/connections.c:139
+msgid "DEFAULT6"
+msgstr "デフォルト6"
+
+#. 6
+#: ../cli/src/connections.c:140
+msgid "SPEC-OBJECT"
+msgstr "スペックオブジェクト"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:143
+msgid "CON-PATH"
+msgstr "CON パス"
+
+#. 10
+#: ../cli/src/connections.c:144
+msgid "ZONE"
+msgstr "ゾーン"
+
+#. 11
+#: ../cli/src/connections.c:145
+msgid "MASTER-PATH"
+msgstr "マスターパス"
+
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
+msgid "GENERAL"
+msgstr "全般"
+
+#. 0
+#: ../cli/src/connections.c:154
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:169
+msgid "USERNAME"
+msgstr "ユーザー名"
+
+#. 2
+#: ../cli/src/connections.c:170
+msgid "GATEWAY"
+msgstr "ゲートウェイ"
+
+#. 3
+#: ../cli/src/connections.c:171
+msgid "BANNER"
+msgstr "バナー"
+
+#. 4
+#: ../cli/src/connections.c:172
+msgid "VPN-STATE"
+msgstr "VPN の状態"
+
+#. 5
+#: ../cli/src/connections.c:173
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:195
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id <id> | uuid <id> | system | user]\n"
+#| "  status\n"
+#| "  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout <timeout>]\n"
+#| "  down id <id> | uuid <id>\n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id <id> | uuid <id> | system | user]\n"
-"  status\n"
-"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
-"<timeout>]\n"
+"  list [id <id> | uuid <id>]\n"
+"  status [id <id> | uuid <id> | path <path>]\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [nsp <name>] [--nowait] [--timeout <timeout>]\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout <timeout>]\n"
 "  down id <id> | uuid <id>\n"
+"  delete id <id> | uuid <id>\n"
+"\n"
 msgstr ""
 "使用法: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
 "  list [id <id> | uuid <id> | system | user]\n"
 "  status\n"
-"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
-"<timeout>]\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout <timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
-#, c-format
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:442
+#, fuzzy, c-format
+#| msgid "Error: 'stp': %s."
 msgid "Error: 'con list': %s"
-msgstr "エラー:'con list': %s"
+msgstr "エラー:'stp': %s。"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
-#, c-format
+#: ../cli/src/connections.c:258 ../cli/src/connections.c:444
+#, fuzzy, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "エラー:'con list': %s ; 許可されるフィールド: %s"
+msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:266
 msgid "Connection details"
 msgstr "接続の詳細"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "システム"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "ユーザー"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:317
 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
+#: ../cli/src/connections.c:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376
+#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379
+#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382
+#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514
+#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516
+#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595
+#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597
+#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599
+#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601
+#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603
+#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605
+#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688
+#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081
 msgid "yes"
 msgstr "はい"
 
-#: ../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
+#: ../cli/src/connections.c:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:868 ../cli/src/settings.c:941
+#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377
+#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381
+#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513
+#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515
+#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594
+#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596
+#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598
+#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600
+#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602
+#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604
+#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606
+#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044
+#: ../cli/src/settings.c:2081
 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:393
+#, fuzzy
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "接続の詳細"
 
-#: ../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
+#: ../cli/src/connections.c:406 ../cli/src/connections.c:948
+#: ../cli/src/connections.c:1486 ../cli/src/connections.c:1501
+#: ../cli/src/connections.c:1510 ../cli/src/connections.c:1520
+#: ../cli/src/connections.c:1532 ../cli/src/connections.c:1641
+#: ../cli/src/connections.c:1743 ../cli/src/devices.c:1192
+#: ../cli/src/devices.c:1202 ../cli/src/devices.c:1320
+#: ../cli/src/devices.c:1328 ../cli/src/devices.c:1692
+#: ../cli/src/devices.c:1699 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1720 ../cli/src/devices.c:1737
+#: ../cli/src/devices.c:1748 ../cli/src/devices.c:1969
+#: ../cli/src/devices.c:1976
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:419
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "エラー: %s - そのような接続はありません。"
 
-#: ../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
+#: ../cli/src/connections.c:425 ../cli/src/connections.c:1545
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1750
+#: ../cli/src/devices.c:976 ../cli/src/devices.c:1056
+#: ../cli/src/devices.c:1216 ../cli/src/devices.c:1334
+#: ../cli/src/devices.c:1761 ../cli/src/devices.c:1982
 #, c-format
 msgid "Unknown parameter: %s\n"
-msgstr "不明なパラメータ: %s\n"
+msgstr "不明なパラメーター: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:434
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "エラー: 有効なパラメータが指定されていません。"
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:449 ../cli/src/connections.c:1846
+#: ../cli/src/devices.c:2193 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
-msgstr "エラー: %s"
-
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "エラー: 'con status': %s"
-
-#: ../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:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "デバイス '%s'上にアクティブな接続がありません"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "アクティブな接続、又はデバイスがありません"
+msgstr "エラー: %s."
 
-#: ../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
+#: ../cli/src/connections.c:462
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:464
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../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:468
+msgid "deactivated"
+msgstr "停止しました"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:480
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続(準備)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:482
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続(認証が必要)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:484
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:486
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続(IP 設定を取得)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:488
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:490
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:492
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:548 ../cli/src/connections.c:558
+msgid "N/A"
+msgstr "なし"
+
+#: ../cli/src/connections.c:752 ../cli/src/connections.c:976
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
+msgid "Error: 'con status': %s"
+msgstr "エラー: 'device status': %s"
+
+#: ../cli/src/connections.c:754 ../cli/src/connections.c:978
+#, fuzzy, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
+
+#: ../cli/src/connections.c:762
+msgid "Active connection details"
+msgstr "アクティブな接続の詳細"
+
+#: ../cli/src/connections.c:898 ../cli/src/connections.c:1560
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1764
+#: ../cli/src/devices.c:1003 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1231 ../cli/src/devices.c:1364
+#: ../cli/src/devices.c:1783 ../cli/src/devices.c:2011
+#: ../cli/src/network-manager.c:311
+#, fuzzy, c-format
+#| msgid "Error: NetworkManager is not running."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "エラー: NetworkManager が起動していません。"
+
+#: ../cli/src/connections.c:902 ../cli/src/connections.c:1564
+#: ../cli/src/connections.c:1677 ../cli/src/connections.c:1768
+#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1069
+#: ../cli/src/devices.c:1235 ../cli/src/devices.c:1368
+#: ../cli/src/devices.c:1787 ../cli/src/devices.c:2015
+#: ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "エラー: NetworkManager が起動していません。"
+
+#: ../cli/src/connections.c:934
+#, fuzzy
+#| msgid "Active connection details"
+msgid "Active connections"
+msgstr "アクティブな接続の詳細"
+
+#: ../cli/src/connections.c:959
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "エラー: '%s' はアクティブな接続ではありません。"
+
+#: ../cli/src/connections.c:964
+#, fuzzy, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "不明なパラメーター: %s\n"
+
+#: ../cli/src/connections.c:1071
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "デバイス '%s' 上にアクティブな接続はありません"
+
+#: ../cli/src/connections.c:1079
+msgid "no active connection or device"
+msgstr "アクティブな接続またはデバイスがありません"
+
+#: ../cli/src/connections.c:1150
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
+
+#: ../cli/src/connections.c:1153
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "接続 '%s'用のデバイスが見つかりません"
+
+#: ../cli/src/connections.c:1165
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1167
 msgid "none"
 msgstr "なし"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1169
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1171
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1173
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1175
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1177
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1179
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1181
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1183
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1185
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1187
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "状態: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1204 ../cli/src/connections.c:1409
 #, c-format
-msgid "Connection activated\n"
-msgstr "接続はアクティベート済み\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1209 ../cli/src/connections.c:1310
 #, c-format
 msgid "Error: Connection activation failed."
-msgstr "エラー: 接続のアクティベーションに失敗"
+msgstr "エラー: 接続のアクティベートに失敗しました。"
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1234
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "状態: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN 接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1242
 #, c-format
 msgid "Error: Connection activation failed: %s."
-msgstr "エラー: 接続のアクティベーションに失敗: %s."
+msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1339 ../cli/src/devices.c:1125
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1400
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../cli/src/connections.c:1279
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "エラー: '%s'用のアクティブ接続の取得に失敗"
-
-#: ../cli/src/connections.c:1288
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "アクティブ接続の状態: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "アクティブ接続のパス: %s\n"
-
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1494 ../cli/src/connections.c:1649
+#: ../cli/src/connections.c:1777
 #, c-format
 msgid "Error: Unknown connection: %s."
-msgstr "エラー: 不明な接続: %s"
+msgstr "エラー: 不明な接続: %s。"
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
-#, c-format
+#: ../cli/src/connections.c:1540 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1756
+#, fuzzy, c-format
+#| msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgid "Error: timeout value '%s' is not valid."
-msgstr "エラー: 制限時間値の '%s' は有効でありません"
+msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1553 ../cli/src/connections.c:1666
+#: ../cli/src/connections.c:1757
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "エラー: id か又は uuid の指定が必要です"
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1586
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "エラー: 適切なデバイスが見付かりません: %s"
+msgstr "エラー: 適切なデバイスが見つかりません: %s"
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1588
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "エラー: 適切なデバイスが見付かりません"
+msgstr "エラー: 適切なデバイスが見つかりません"
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1702
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "警告: 接続はアクティブでありません\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1716
 #, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "エラー: 接続の削除に失敗しました: %s"
+
+#: ../cli/src/connections.c:1837
+#, fuzzy, c-format
+#| msgid "Error: 'radio' command '%s' is not valid."
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "エラー: 'con' コマンド '%s' は有効ではありません"
+msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1905
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "エラー: D-Bus に接続できませんでした"
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1913
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "エラー: システム設定を取得できませんでした"
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1923
 #, c-format
-msgid "Error: Could not get user settings."
-msgstr "エラー: ユーザー設定を取得できませんでした"
-
-#: ../cli/src/connections.c:1622
-#, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません"
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません。"
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:110 ../cli/src/devices.c:204
+#: ../cli/src/devices.c:220
 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
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 2
-#: ../cli/src/devices.c:74
+#. 5
+#: ../cli/src/devices.c:86 ../cli/src/devices.c:170
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-セッティング"
+#: ../cli/src/devices.c:88
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-プロパティ"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:217
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:90
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:91
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:92
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:93
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "ボンド"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
+
+#. 12
+#: ../cli/src/devices.c:96
+msgid "CONNECTIONS"
+msgstr "接続"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:112
+msgid "VENDOR"
+msgstr "ベンダー"
+
+#. 3
+#: ../cli/src/devices.c:113
+msgid "PRODUCT"
+msgstr "製品"
+
+#. 4
+#: ../cli/src/devices.c:114
 msgid "DRIVER"
 msgstr "ドライバー"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:115
+msgid "DRIVER-VERSION"
+msgstr "ドライバーバージョン"
+
+#. 6
+#: ../cli/src/devices.c:116
+msgid "FIRMWARE-VERSION"
+msgstr "ファームウェアバージョン"
+
+#. 7
+#: ../cli/src/devices.c:117
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:119
+msgid "REASON"
+msgstr "原因"
+
+#. 10
+#: ../cli/src/devices.c:120
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:121
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:122
+msgid "NM-MANAGED"
+msgstr "NM 管理"
+
+#. 14
+#: ../cli/src/devices.c:124
+msgid "FIRMWARE-MISSING"
+msgstr "ファームウェア不足"
+
+#. 15
+#: ../cli/src/devices.c:125
+msgid "CONNECTION"
+msgstr "接続"
+
+#. 0
+#: ../cli/src/devices.c:135
+msgid "AVAILABLE-CONNECTION-PATHS"
+msgstr "使用可能な接続パス"
+
+#. 1
+#: ../cli/src/devices.c:136
+msgid "AVAILABLE-CONNECTIONS"
+msgstr "使用可能な接続"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:145
 msgid "CARRIER-DETECT"
 msgstr "キャリア検出"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:146
 msgid "SPEED"
 msgstr "速度"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:155
 msgid "CARRIER"
 msgstr "キャリア"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:165
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:166
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:167
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:168
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:169
 msgid "CCMP"
 msgstr "CCMP"
 
+#. 6
+#: ../cli/src/devices.c:171
+msgid "ADHOC"
+msgstr "アドホック"
+
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "アドレス"
+#: ../cli/src/devices.c:181
+msgid "CTR-FREQ"
+msgstr "中心周波数"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "接頭辞"
+#: ../cli/src/devices.c:182
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "ゲートウェイ"
+#: ../cli/src/devices.c:183
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:184
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:185
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:195
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:196
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:197
 msgid "MODE"
 msgstr "モード"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:198
 msgid "FREQ"
 msgstr "周波数"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:199
 msgid "RATE"
 msgstr "レート"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:200 ../cli/src/devices.c:218
 msgid "SIGNAL"
 msgstr "信号"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:201
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:202
 msgid "WPA-FLAGS"
 msgstr "WPA-フラグ"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:203
 msgid "RSN-FLAGS"
 msgstr "RSN-フラグ"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:205 ../cli/src/devices.c:221
 msgid "ACTIVE"
 msgstr "アクティブ"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:233
+msgid "SLAVES"
+msgstr "スレーブ"
+
+#. 0
+#: ../cli/src/devices.c:242
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:258
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli device { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | show | disconnect | wifi | wimax }\n"
+#| "\n"
+#| "  COMMAND := { status | show | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "\n"
+#| "  show [<ifname>]\n"
+#| "\n"
+#| "  disconnect <ifname>\n"
+#| "\n"
+#| "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+#| "\n"
+#| "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>] [bssid <BSSID>] [name <name>]\n"
+#| "\n"
+#| "               [private yes|no]\n"
+#| "\n"
+#| "  wifi rescan [[ifname] <ifname>]\n"
+#| "\n"
+#| "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface <iface>]\n"
 "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"  wifi [list [iface <iface>] [bssid <BSSID>]]\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n"
+"               [--private] [--nowait] [--timeout <timeout>]\n"
+"  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
-"使用法: nmcli dev { COMMAND | help }\n"
+"使い方: nmcli device { コマンド | help }\n"
 "\n"
-"  COMMAND := { status | list | disconnect | wifi }\n"
+"  コマンド := { status | show | disconnect | wifi | wimax }\n"
+"\n"
+"  コマンド := { status | show | disconnect | wifi }\n"
 "\n"
 "  status\n"
-"  list [iface <iface>]\n"
-"  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-"  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"\n"
+"  show [<ifname>]\n"
+"\n"
+"  disconnect <ifname>\n"
+"\n"
+"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>] [bssid <BSSID>] [name <name>]\n"
+"\n"
+"               [private yes|no]\n"
+"\n"
+"  wifi rescan [[ifname] <ifname>]\n"
+"\n"
+"  wimax [list [ifname <ifname>] [nsp <name>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "管理無し"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "利用不可"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "切断済み"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "接続中(準備)"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "接続中(設定中)"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "接続中(認証が必要)"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "接続中(IP 設定を取得中)"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "接続済み"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "接続に失敗"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "不明"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:361
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 アドレス 0x%X を変換中にエラー発生"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:417
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:418
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:427
 msgid "Encrypted: "
 msgstr "暗号化:"
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:432
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:434
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:436
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:439
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:448
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:449
 msgid "Infrastructure"
 msgstr "インフラストラクチャ"
 
-#: ../cli/src/devices.c:442
-#, c-format
+#: ../cli/src/devices.c:485
+msgid "Home"
+msgstr "ホーム"
+
+#: ../cli/src/devices.c:488
+msgid "Partner"
+msgstr "パートナー"
+
+#: ../cli/src/devices.c:491
+msgid "Roaming"
+msgstr "ローミング"
+
+#: ../cli/src/devices.c:563
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'dev list': %s"
-msgstr "エラー: 'dev list': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/devices.c:444
-#, c-format
+#: ../cli/src/devices.c:565
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s; allowed fields: %s"
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "エラー: 'dev list': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'device status': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:574
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:621 ../cli/src/devices.c:624 ../cli/src/devices.c:1151
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "不明)"
+#: ../cli/src/devices.c:633
+msgid "not connected"
+msgstr "未接続"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:660
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:736
 msgid "on"
 msgstr "オン"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:736
 msgid "off"
 msgstr "オフ"
 
-#: ../cli/src/devices.c:710
-#, c-format
+#: ../cli/src/devices.c:993
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'dev status': %s"
-msgstr "エラー: 'dev status': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/devices.c:712
-#, c-format
+#: ../cli/src/devices.c:995
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s; allowed fields: %s"
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "エラー: 'dev status': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'device status': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1018
 msgid "Status of devices"
-msgstr "デバイスのステータス"
+msgstr "デバイスの状態"
 
-#: ../cli/src/devices.c:747
-#, c-format
+#: ../cli/src/devices.c:1049
+#, fuzzy, c-format
+#| msgid "Error: %s argument is missing."
 msgid "Error: '%s' argument is missing."
-msgstr "エラー: '%s' 引数がありません。"
+msgstr "エラー: %s 引数がありません。"
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1090 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1396 ../cli/src/devices.c:2043
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "エラー: デバイス'%s' が見付かりません"
+msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1113
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "成功: デバイス '%s' は正常に切断されました。"
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1148
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1161
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "デバイスの状態: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "デバイス '%s' は切断されています。\n"
 
-#: ../cli/src/devices.c:896
-#, c-format
+#: ../cli/src/devices.c:1224
+#, fuzzy, c-format
+#| msgid "Error: id or uuid has to be specified."
 msgid "Error: iface has to be specified."
-msgstr "エラー: iface を指定する必要があります。"
+msgstr "エラー: id か又は uuid の指定が必要です"
 
-#: ../cli/src/devices.c:1011
-#, c-format
+#: ../cli/src/devices.c:1354
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi': %s"
 msgid "Error: 'dev wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
-#, c-format
+#: ../cli/src/devices.c:1356
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi': %s; allowed fields: %s"
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "エラー: 'dev wifi': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'dev wifi': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1379
+#, fuzzy
+#| msgid "Wi-Fi scan list"
 msgid "WiFi scan list"
-msgstr "WiFi スキャン一覧"
+msgstr "Wi-Fi スキャン一覧"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1416 ../cli/src/devices.c:1470
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "エラー: hwaddr '%s' のアクセスポイントが見付かりません"
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../cli/src/devices.c:1072
-#, c-format
+#: ../cli/src/devices.c:1433
+#, fuzzy, c-format
+#| msgid "Error: Device '%s' is not a Wi-Fi device."
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "エラー: デバイス '%s' は WiFi デバイスではありません。"
+msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+
+#: ../cli/src/devices.c:1501 ../cli/src/devices.c:1547
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
+
+#: ../cli/src/devices.c:1506
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "エラー: 接続のアクティベートに失敗しました: (%d) %s。"
+
+#: ../cli/src/devices.c:1531
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: (%d) %s"
+
+#: ../cli/src/devices.c:1539
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
+
+#: ../cli/src/devices.c:1683
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "エラー: SSID または BSSID がありません。"
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
+
+#: ../cli/src/devices.c:1730
+#, c-format
+msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用してください。"
+
+#: ../cli/src/devices.c:1770
+#, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
+
+#: ../cli/src/devices.c:1776
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1805
 #, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+
+#: ../cli/src/devices.c:1807
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1825
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1827
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1925
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi' command '%s' is not valid."
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "エラー: 'dev wifi' コマンド '%s' は無効です。"
+msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
+
+#: ../cli/src/devices.c:2001
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "エラー: 'device wimax': %s"
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:2003
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax': %s; allowed fields: %s"
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "エラー: 'device wimax': %s; 許可フィールド: %s"
+
+#: ../cli/src/devices.c:2026
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP 一覧"
+
+#: ../cli/src/devices.c:2063
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "エラー: '%s' と言う名前の NSP が見つかりませんでした。"
+
+#: ../cli/src/devices.c:2074
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "エラー: デバイス '%s' は WiMAX デバイスではありません。"
+
+#: ../cli/src/devices.c:2105
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "エラー: nsp '%s' のアクセスポイントが見つかりませんでした。"
+
+#: ../cli/src/devices.c:2132
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "エラー: 'dev wimax' のコマンド '%s' は無効です。"
+
+#: ../cli/src/devices.c:2185
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "エラー: 'dev' コマンド '%s' は無効です。"
+msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "実行中"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "バージョン"
+
+#. 2
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr ""
+
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "WIFI ハードウェア"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "WWAN ハードウェア"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
+#. 7
+#: ../cli/src/network-manager.c:45
+#, fuzzy
+#| msgid "WIFI-HARDWARE"
+msgid "WIMAX-HARDWARE"
+msgstr "WIFI ハードウェア"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
 #: ../cli/src/network-manager.c:62
-#, c-format
+msgid "PERMISSION"
+msgstr "パーミッション"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "値"
+
+#: ../cli/src/network-manager.c:77
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli radio { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { all | wifi | wwan | wimax }\n"
+#| "\n"
+#| "  all | wifi | wwan | wimax [ on | off ]\n"
+#| "\n"
+#| "  COMMAND := { all | wifi | wwan }\n"
+#| "\n"
+#| "  all | wifi | wwan [ on | off ]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"使用法: nmcli nm { COMMAND | help }\n"
+"使い方: nmcli radio { コマンド | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  コマンド := { all | wifi | wwan | wimax }\n"
 "\n"
-"  status\n"
-"  sleep\n"
-"  wakeup\n"
-"  wifi [on|off]\n"
-"  wwan [on|off]\n"
+"  all | wifi | wwan | wimax [ on | off ]\n"
+"\n"
+"  コマンド := { all | wifi | wwan }\n"
+"\n"
+"  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "休止中"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "接続中"
 
-#: ../cli/src/network-manager.c:125
-#, c-format
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "接続完了 (ローカルのみ)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "接続完了 (サイトのみ)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "切断中"
+
+#: ../cli/src/network-manager.c:158
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'nm status': %s"
-msgstr "エラー: 'nm status': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "NetworkManager のステータス"
-
-#. 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
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 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
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "無効"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager のステータス"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "実行中"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "実行していません"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
-#, c-format
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "認証"
+
+#: ../cli/src/network-manager.c:301
+#, fuzzy, c-format
+#| msgid "Error: 'general permissions': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "エラー: 'general permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, fuzzy, c-format
+#| msgid "Error: 'general permissions': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "エラー: 'general permissions': %s; 許可フィールド: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager のパーミッション"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
+#, fuzzy, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "エラー: D-Bus に接続できませんでした"
+
+#: ../cli/src/network-manager.c:361
+#, fuzzy, c-format
+#| msgid "Error: Could not create NMClient object."
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
+
+#: ../cli/src/network-manager.c:367
+#, fuzzy, c-format
+#| msgid "Error: %s: %s."
+msgid "Error in sleep: %s"
+msgstr "エラー: %s: %s。"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
+#, fuzzy, c-format
+#| msgid "Error: '--fields' value '%s' is not valid here (allowed fields: %s)"
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "エラー: '--fields' の値 '%s' はここでは有効ではありません; 許可されるフィールド: %s"
+msgstr "エラー: '--fields' の値 '%s' はここでは無効です; 許可されるフィールド: %s"
 
-#: ../cli/src/network-manager.c:209
-msgid "WiFi enabled"
-msgstr "WiFi は有効です"
+#: ../cli/src/network-manager.c:424
+#, fuzzy
+#| msgid "Networking"
+msgid "Networking enabled"
+msgstr "ネットワーキング"
+
+#: ../cli/src/network-manager.c:440
+#, fuzzy, c-format
+#| msgid "Error: invalid '%s' argument: '%s' (use on/off)."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:450
 #, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr ""
+
+#: ../cli/src/network-manager.c:458
+#, fuzzy, c-format
+#| msgid "Error: invalid '%s' argument: '%s' (use on/off)."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
+
+#: ../cli/src/network-manager.c:479
+msgid "WiFi enabled"
+msgstr "Wi-Fi は有効です"
+
+#: ../cli/src/network-manager.c:495
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "エラー: 無効な'wifi' パラメータ: '%s'"
+msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN は有効です"
 
-#: ../cli/src/network-manager.c:252
-#, c-format
+#: ../cli/src/network-manager.c:533
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "エラー: 無効な'wwan' パラメータ: '%s'"
-
-#: ../cli/src/network-manager.c:263
-#, c-format
+msgstr "エラー:  '%s' は無効な追加引数です。"
+
+#: ../cli/src/network-manager.c:556
+#, fuzzy
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "Wi-Fi は有効です"
+
+#: ../cli/src/network-manager.c:572
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "エラー:  '%s' は無効な追加引数です。"
+
+#: ../cli/src/network-manager.c:588
+#, fuzzy, c-format
+#| msgid "Error: 'dev' command '%s' is not valid."
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "エラー: 'nm' コマンド '%s' は無効です。"
-
-#: ../cli/src/nmcli.c:69
-#, c-format
+msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
+
+#: ../cli/src/nmcli.c:76
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+#| "\n"
+#| "OPTIONS\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"
+#| "  -n[ocheck]                                 don't check nmcli and NetworkManager versions\n"
+#| "  -a[sk]                                     ask for missing parameters\n"
+#| "  -w[ait] <seconds>                          set timeout waiting for finishing operations\n"
+#| "  -v[ersion]                                 show program version\n"
+#| "  -h[elp]                                    print this help\n"
+#| "\n"
+#| "OBJECT\n"
+#| "  g[eneral]       NetworkManager's general status and operations\n"
+#| "  n[etworking]    overall networking control\n"
+#| "  r[adio]         NetworkManager radio switches\n"
+#| "  c[onnection]    NetworkManager's connections\n"
+#| "  d[evice]        devices managed by NetworkManager\n"
+#| "\n"
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -973,588 +1810,894 @@ msgid ""
 "  -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"
+"  -e[scape] yes|no                           escape columns separators in values\n"
+"  -n[ocheck]                                 don't check nmcli and NetworkManager versions\n"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"使用法: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"使い方: %s [オプション] オブジェクト { コマンド | help }\n"
 "\n"
-"OPTIONS\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"
+"  -t[erse]                                   簡潔な出力\n"
+"  -p[retty]                                  人間が読みやすい出力\n"
+"  -m[ode] tabular|multiline                  出力モード\n"
+"  -f[ields] <field1,field2,...>|all|common   出力フィールドの指定\n"
+"  -e[scape] yes|no                           値内のコラムセパレーターをエスケープ\n"
+"  -n[ocheck]                                 nmcli および NetworkManager のバージョンをチェックしない\n"
+"  -a[sk]                                     足りないパラメーターを問い合わせる\n"
+"  -w[ait] <seconds>                          動作の完了を待機するタイムアウトを設定\n"
+"  -v[ersion]                                 プログラムバージョン\n"
+"  -h[elp]                                    このヘルプを出力\n"
 "\n"
-"OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"オブジェクト\n"
+"  g[eneral]       NetworkManager の全般的な状態と動作\n"
+"  n[etworking]    全体的なネットワーク制御\n"
+"  r[adio]         NetworkManager ラジオスイッチ\n"
+"  c[onnection]    NetworkManager の接続\n"
+"  d[evice]        NetworkManager で管理しているデバイス\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を試して下さい。"
+msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "エラー: オプション '--terse' は2回目の指定です。"
+msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "エラー: オプション '--terse' は '--pretty' と相互に独占的です。"
+msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "エラー: オプション '--pretty' は2回目の指定です。"
+msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "エラー: オプション '--pretty' は '--terse' と相互に独占的です。"
+msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を試して下さい。"
+msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "シグナル %d が出ました、シャットダウンします..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "エラー: NetworkManager へ接続出来ませんでした。"
+#: ../cli/src/nmcli.c:272
+msgid "Error: Could not create NMClient object."
+msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "成功"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:595
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:597
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit パスフレーズ)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:600 ../cli/src/settings.c:728
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:626
 msgid "0 (unknown)"
 msgstr "0 (不明)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:632
 msgid "any, "
 msgstr "いずれでも、"
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:634
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:636
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:638
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:640
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:642
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:644
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:646
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:648
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:650
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:652
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:654
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:656
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:658
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:676
+msgid "0 (NONE)"
+msgstr "0 (なし)"
+
+#: ../cli/src/settings.c:682
+msgid "REORDER_HEADERS, "
+msgstr "ヘッダーの順序変更、"
+
+#: ../cli/src/settings.c:684
+msgid "GVRP, "
+msgstr "GVRP、"
+
+#: ../cli/src/settings.c:686
+msgid "LOOSE_BINDING, "
+msgstr "結合を緩める、"
+
+#: ../cli/src/settings.c:722
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (無効)"
+
+#: ../cli/src/settings.c:724
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (有効、パブリック IP 優先)"
+
+#: ../cli/src/settings.c:726
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (有効、テンポラリ IP を優先)"
+
+#: ../cli/src/settings.c:738
+msgid "0 (none)"
+msgstr "0 (なし)"
+
+#: ../cli/src/settings.c:744
+msgid "agent-owned, "
+msgstr "エージェント所有、 "
+
+#: ../cli/src/settings.c:746
+msgid "not saved, "
+msgstr "未保存、 "
+
+#: ../cli/src/settings.c:748
+msgid "not required, "
+msgstr "不必要、 "
+
+#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163
+#: ../cli/src/settings.c:1904
 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:105
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 アドレス 0x%X をテキスト形式に変換中にエラーが発生しました"
+
+#: ../cli/src/utils.c:133
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 アドレス '%s' をテキスト形式に変換中にエラーが発生しました"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "無効なフィールド  '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "オプション '--terse' には '--fields' の指定が必要です"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' ではありません"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:470
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+
+#: ../cli/src/utils.c:478
+#, fuzzy, c-format
+#| msgid "Error: Connection deletion failed: %s"
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "エラー: 接続の削除に失敗しました: %s"
+
+#: ../cli/src/utils.c:523
+#, c-format
+msgid "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"
+msgstr "警告: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。警告を回避する場合は --nocheck を使用します。\n"
+
+#: ../cli/src/utils.c:532
+#, c-format
+msgid "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."
+msgstr "エラー: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。--nocheck を使用すると強制的に実行することはできますが、予測できない結果となります。"
+
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM キーファイルは終了タグ '%s' を持ちません。"
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM プライベートキーファイルではないようです。"
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ファイルデータの保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "不正形式の PEM ファイル: Proc-Type は最初のタグではありません。"
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "不正形式の PEM ファイル: 不明な Proc-Type タグ '%s' です。"
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "不正形式の PEM ファイル: DEK-Info は2つ目のタグではありません。"
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見付かりません。"
+msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見つかりません。"
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "不正形式の PEM ファイル: DEK-Info タグ内に無効な形式の IV"
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "不正形式の PEM ファイル: 不明なプライベートキー暗号文 '%s'。"
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "プライベートキーを復号できませんでした。"
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM  証明書 '%s' は終了タグ '%s'持ちません。"
+#: ../libnm-util/crypto.c:290
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "期待されている PKCS#8 開始タグの検出に失敗しました。"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:298
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "証明書の復号に失敗しました。"
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "期待されている PKCS#8 終了タグ '%s' の検出に失敗しました。"
+
+#: ../libnm-util/crypto.c:318
+#, fuzzy
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "ファイルデータの保存に十分なメモリーがありません。"
+
+#: ../libnm-util/crypto.c:323
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 プライベートキーの復号に失敗しました。"
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:345 ../libnm-util/crypto.c:631
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "証明書データの保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "ファイルデータの保存に十分なメモリーがありません。"
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:371
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV はその長さで偶数のバイト数でなければなりません。"
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:380
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV の保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:391
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV は 16進法でない数字を含んでいます。"
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
-#: ../libnm-util/crypto_nss.c:336
+#: ../libnm-util/crypto.c:429 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "プライベートキー暗号文 '%s' は不明です。"
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:438
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "プライベートキーの解読に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:503
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "復号したプライベートキーの保存に十分なメモリーがありません。"
+
+#: ../libnm-util/crypto.c:548
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "プライベートキーのタイプを判定できません。"
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:603
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "復号したプライベートキーの保存に十分なメモリーがありません。"
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
+
+#: ../libnm-util/crypto.c:612
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
+
+#: ../libnm-util/crypto.c:636
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "証明書の復号に失敗しました。"
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "暗号化エンジンの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "MD5 エンジンの初期化に失敗しました: %s / %s"
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "IV の長さが無効です (最低 %zd の長さが必要)。"
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "復号したキーバッファ用に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "復号化暗号文コンテキストの初期化に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "復号用のシンメトリックキーの設定に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "復号用の IV の設定に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "プライベートキーの復号に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "プライベートキーの復号に失敗しました: 予想外の不要語句の長さです。"
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "プライベートキーの復号に失敗しました。"
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "暗号化用のメモリー割り当てが出来ませんでした。"
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "暗号化暗号文コンテキストの初期化に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "暗号化用のシンメトリックキーの設定に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "暗号化用の IV の設定に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "データの暗号化に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "証明書データの初期化にエラー発生: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "証明書をデコードできませんでした: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "PKCS#12 デコーダを初期化できません: %s"
+msgstr "PKCS#12 デコーダーを初期化できません: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルをデコードできません: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルを確証できません: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ファイルをデコードできませんでした: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "暗号化エンジンの初期化に失敗しました: %d。"
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 コンテキストの初期化に失敗しました: %d。"
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "IV の長さが無効です (最低でも %d は必要)。"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "復号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "復号化用シンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "復号化用 IV の設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "復号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "プライベートキーの復号に失敗しました: %d"
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "プライベートキーの復号に失敗しました: 復号したデータが大きすぎます。"
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "プライベートキー復号化の完了に失敗しました: %d"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "暗号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "暗号化用のシンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "暗号化用の IV の設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "暗号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "暗号化に失敗しました: %d"
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "暗号化の後に予期しないデータの量があります。"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
-msgstr "証明書のデコードが出来ません: %d"
+msgstr "証明書のデコードができません: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "パスワードを UCS2 に変換できません: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
-msgstr "PKCS#12 デコーダを初期化出来ません: %d"
+msgstr "PKCS#12 デコーダーを初期化できません: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
-msgstr "PKCS#12 ファイルをデコード出来ません: %d"
+msgstr "PKCS#12 ファイルをデコードできません: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
-msgstr "PKCS#12 ファイルを確証出来ません: %d"
+msgstr "PKCS#12 ファイルを確証できません: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2158
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "暗号化キーを作成するのに十分なメモリーがありません。"
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2268
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ファイル作成用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2280
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ファイルへの IV の書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2292
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "PEM ファイルへの暗号化キーの書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2311
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "PEM ファイルデータ用にメモリーを割り当て出来ません。"
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "netlink メッセージのプロセス中にエラー発生: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "システムのネットワーキングを有効または無効にする"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ソケット上でデータを待っている際にエラーが発生しました"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
+msgstr "NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用はシステムの電源管理に限ってください)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ状態からの解除が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Wi-Fi デバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "モバイルブロードバンドのデバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が阻止されています"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX モバイルブロードバンドのデバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "ネットワーク接続の制御を許可"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "個人のネットワーク接続を編集"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "全ユーザーのネットワーク接続を編集"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "システムポリシーにより全ユーザーのネットワーク設定の編集が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "永続的なシステムのホスト名を修正"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
+
+#: ../src/main.c:129
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "リンク状況監視用のネットリンクに接続できません: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "信号マスクの設定に失敗しました: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:138
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink ハンドル信任情報の伝達を有効にできません: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "信号処理スレッドの作成に失敗しました: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:153
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "リンクステータス監視用のネットリンクハンドルを割り当て出来ません: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s のオープンに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:159
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "リンク状況監視用のネットリンクのリンクキャッシュを割り当てできません: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s への書き込みに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:164
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink グループへ参加できません: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:207
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "リンクキャッシュの更新中にエラー: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager はすでに起動しています (pid %ld)\n"
+
+#: ../src/main.c:333
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager のバージョンを表示して終了する"
+
+#: ../src/main.c:334
+msgid "Don't become a daemon"
+msgstr "デーモンにしない"
+
+#: ../src/main.c:335
+msgid "Make all warnings fatal"
+msgstr "すべての警告を致命的にする"
+
+#: ../src/main.c:336
+msgid "Specify the location of a PID file"
+msgstr "PID ファイルの場所を指定する"
+
+#: ../src/main.c:336
+msgid "filename"
+msgstr "ファイル名"
 
-#: ../src/main.c:502
+#: ../src/main.c:337
+msgid "State file location"
+msgstr "状態ファイルの場所"
+
+#: ../src/main.c:337
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:338
+msgid "Config file location"
+msgstr "設定ファイルの場所"
+
+#: ../src/main.c:338
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:339
+msgid "List of plugins separated by ','"
+msgstr "複数のプラグインを「,」で区切った一覧"
+
+#: ../src/main.c:339
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:341
+#, fuzzy
+#| msgid "Log level: one of [%s]"
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "ログレベル: [%s] のいずれか"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:344
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+
+#: ../src/main.c:350
+msgid "An http(s) address for checking internet connectivity"
+msgstr "インターネットの接続性を確認するための http(s) アドレス"
+
+#: ../src/main.c:351
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "接続性チェックの間隔 (秒単位)"
+
+#: ../src/main.c:352
+msgid "The expected start of the response"
+msgstr "期待されている応答の開始点"
+
+#: ../src/main.c:352
+msgid "Bingo!"
+msgstr "当たり!"
+
+#: ../src/main.c:370
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules はご使用のプラットフォームでは対応していません!\n"
+
+#: ../src/main.c:389
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager によりすべてのネットワーク接続が監視され、\n"
+"使用に最適な接続が自動的に選択されます。また、コンピューター内の\n"
+"ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
+"ユーザーによる指定も許可されます。"
+
+#: ../src/main.c:395
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "無効なオプション。--help を使用して有効なオプションの一覧をご覧下さい。\n"
+msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。\n"
+
+#: ../src/main.c:405
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager を実行するには root になる必要があります!\n"
+
+#: ../src/main.c:433
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "設定の読み込みに失敗しました: (%d) %s\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:444
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s  --help を使用して有効なオプションの一覧をご覧下さい。\n"
+msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/main.c:451
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "状態ファイル %s の解析に失敗しました: (%d) %s\n"
+
+#: ../src/main.c:468
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "デーモン化できませんでした: %s [エラー %u]\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1563,79 +2706,2027 @@ msgstr ""
 "# %s からマージされています\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
-msgstr "使用できる DHCP クライアントが見付かりませんでした。"
+msgstr "使用できる DHCP クライアントが見つかりませんでした。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
+#, fuzzy
 msgid "'dhclient' could be found."
-msgstr "'dhclient' が見付かりました"
+msgstr "'dhclient' が見つかりました"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
+#, fuzzy
 msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' は見付かりません。"
+msgstr "'dhcpcd' は見つかりません。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "サポートの無い DHCP クライアント '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:376
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "注記: libc リゾルバーは 3つ以上のネームサーバーをサポートできません。"
+
+#: ../src/dns-manager/nm-dns-manager.c:378
+msgid "The nameservers listed below may not be recognized."
+msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
+
+#: ../src/logging/nm-logging.c:143
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "不明なログインレベル '%s'"
+msgstr "不明なログレベル '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:189
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:343
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "注記: libc リゾルバは 3つ以上のネームサーバーをサポートできません。"
+#: ../src/modem-manager/nm-modem-cdma.c:271
+#: ../src/modem-manager/nm-modem-broadband.c:533 ../src/nm-device-bt.c:338
+#, c-format
+msgid "CDMA connection %d"
+msgstr "CDMA 接続 %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:345
-msgid "The nameservers listed below may not be recognized."
-msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
+#: ../src/modem-manager/nm-modem-gsm.c:549
+#: ../src/modem-manager/nm-modem-broadband.c:511 ../src/nm-device-bt.c:334
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM 接続 %d"
+
+#: ../src/nm-device-bond.c:202
+#, c-format
+msgid "Bond connection %d"
+msgstr "ボンド接続 %d"
+
+#: ../src/nm-device-adsl.c:194
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL 接続 %d"
+
+#: ../src/nm-device-bridge.c:201
+#, c-format
+msgid "Bridge connection %d"
+msgstr "ブリッジ接続 %d"
+
+#: ../src/nm-device-bt.c:309
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN 接続 %d"
+
+#: ../src/nm-device-bt.c:342
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN 接続 %d"
+
+#: ../src/nm-device-ethernet.c:1320
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE 接続 %d"
+
+#: ../src/nm-device-ethernet.c:1320 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "有線接続 %d"
+
+#: ../src/nm-device-infiniband.c:299
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand 接続 %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-olpc-mesh.c:293
 #, c-format
-msgid "Auto %s"
-msgstr "自動 %s"
+msgid "Mesh %d"
+msgstr "Mesh %d"
+
+#: ../src/nm-device-vlan.c:331
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN 接続 %d"
+
+#: ../src/nm-manager.c:813
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN 接続 %d"
+
+#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:273
+#: ../src/nm-netlink-monitor.c:714
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink メッセージのプロセス中にエラー発生: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../src/nm-netlink-monitor.c:252
+msgid "error occurred while waiting for data on socket"
+msgstr "ソケット上でデータを待っている際にエラーが発生しました"
+
+#: ../src/nm-netlink-monitor.c:297
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "リンク状況監視用のネットリンクに接続できません: %s"
+
+#: ../src/nm-netlink-monitor.c:308
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink ハンドル信任情報の伝達を有効にできません: %s"
+
+#: ../src/nm-netlink-monitor.c:331 ../src/nm-netlink-monitor.c:391
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "リンクステータス監視用のネットリンクハンドルを割り当てできません: %s"
+
+#: ../src/nm-netlink-monitor.c:416
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "リンク状況監視用のネットリンクのリンクキャッシュを割り当てできません: %s"
+
+#: ../src/nm-netlink-monitor.c:543
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink グループへ参加できません: %s"
+
+#: ../src/nm-netlink-monitor.c:690 ../src/nm-netlink-monitor.c:703
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "リンクキャッシュの更新中にエラー: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "システム"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "保護された WiFi ネットワーク経由で接続共有"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3705
+msgid "Bond"
+msgstr "ボンド"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "開放した WiFi ネットワーク経由で接続共有"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3898
+msgid "Bridge"
+msgstr "ブリッジ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "永続化システムのホスト名を修正"
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\r接続中"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "システム接続を修正"
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (without the option, default value is 30)"
+msgstr "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は 30)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "システムポリシーがシステム設定の修正を阻止します。"
+#: ../test/nm-online.c:143
+#, fuzzy
+#| msgid "Exit immediately if NetworkManager is not running"
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "NetworkManager が起動していない場合は直ちに終了する"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "システムポリシーが永続化システムのホスト名修正を阻止します。"
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "出力を抑制する"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "システムポリシーが保護された WiFi ネットワーク経由の接続共有を阻止します。"
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr ""
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "システムポリシーが開放した WiFi ネットワーク経由の接続共有を阻止します。"
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。"
+
+#~ msgid "invalid IPv4 address '%s'"
+#~ msgstr "無効な IPv4 アドレス '%s'"
+
+#~ msgid "invalid prefix '%s'; <1-32> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <1-32> 許可"
+
+#~ msgid "invalid gateway '%s'"
+#~ msgstr "無効なゲートウェイ '%s'"
+
+#~ msgid "invalid IPv6 address '%s'"
+#~ msgstr "無効な IPv6 アドレス '%s'"
+
+#~ msgid "invalid prefix '%s'; <1-128> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <1-128> 許可"
+
+#~ msgid "invalid IPv4 route '%s'"
+#~ msgstr "無効な IPv4 ルート '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-32> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <0-32> 許可"
+
+#~ msgid "invalid next hop address '%s'"
+#~ msgstr "無効なネクストホップアドレス '%s'"
+
+#~ msgid "invalid metric '%s'"
+#~ msgstr "無効なメトリック '%s'"
+
+#~ msgid "invalid IPv6 route '%s'"
+#~ msgstr "無効な IPv6 ルート '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-128> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <0-128> 許可"
+
+#~ msgid "invalid priority map '%s'"
+#~ msgstr "無効な優先度マップ '%s'"
+
+#~ msgid "priority '%s' is not valid (<0-%ld>)"
+#~ msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
+
+#~ msgid "Setting name? "
+#~ msgstr "設定名は? "
+
+#~ msgid "Property name? "
+#~ msgstr "プロパティ名は? "
+
+#~ msgid "Enter connection type: "
+#~ msgstr "接続タイプを入力してください: "
+
+#~ msgid ""
+#~ "Usage: nmcli connection { COMMAND | help }\n"
+#~ "  COMMAND := { show | up | down | delete }\n"
+#~ "\n"
+#~ "  show configured [[ id | uuid | path ] <ID>]\n"
+#~ "\n"
+#~ "  show active     [[ id | uuid | path | apath ] <ID>]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ] <ID> [ifname <ifname>] [ap <BSSID>]\n"
+#~ "\n"
+#~ "  down [ id | uuid | path | apath ] <ID>\n"
+#~ "\n"
+#~ "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#~ "\n"
+#~ "  modify [ id | uuid | path ] <ID> <setting>.<property> <value>\n"
+#~ "\n"
+#~ "  edit [ id | uuid | path ] <ID>  |  [type <new_con_type>] [con-name <new_con_name>]\n"
+#~ "\n"
+#~ "  delete [ id | uuid | path ] <ID>\n"
+#~ "\n"
+#~ "  reload\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: nmcli connection { コマンド | help }\n"
+#~ "  コマンド := { show | up | down | delete }\n"
+#~ "\n"
+#~ "  show configured [[ id | uuid | path ] <ID>]\n"
+#~ "\n"
+#~ "  show active     [[ id | uuid | path | apath ] <ID>]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ] <ID> [ifname <ifname>] [ap <BSSID>]\n"
+#~ "\n"
+#~ "  down [ id | uuid | path | apath ] <ID>\n"
+#~ "\n"
+#~ "  add 共通オプション タイプ固有オプション IP オプション\n"
+#~ "\n"
+#~ "  modify [ id | uuid | path ] <ID> <setting>.<property> <value>\n"
+#~ "\n"
+#~ "  edit [ id | uuid | path ] <ID>  |  [type <new_con_type>] [con-name <new_con_name>]\n"
+#~ "\n"
+#~ "  delete [ id | uuid | path ] <ID>\n"
+#~ "\n"
+#~ "  reload\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: nmcli connection add { OPTIONS | help }\n"
+#~ "  OPTIONS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#~ "\n"
+#~ "  COMMON_OPTIONS:\n"
+#~ "                  type <type>\n"
+#~ "                  ifname <interface name> | \"*\"\n"
+#~ "                  [con-name <connection name>]\n"
+#~ "                  [autoconnect yes|no]\n"
+#~ "\n"
+#~ "  TYPE_SPECIFIC_OPTIONS:\n"
+#~ "    ethernet:     [mac <MAC address>]\n"
+#~ "                  [cloned-mac <cloned MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    wifi:         ssid <SSID>\n"
+#~ "                  [mac <MAC address>]\n"
+#~ "                  [cloned-mac <cloned MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    wimax:        [mac <MAC address>]\n"
+#~ "                  [nsp <NSP>]\n"
+#~ "\n"
+#~ "    gsm:          apn <APN>\n"
+#~ "                  [user <username>]\n"
+#~ "                  [password <password>]\n"
+#~ "\n"
+#~ "    cdma:         [user <username>]\n"
+#~ "                  [password <password>]\n"
+#~ "\n"
+#~ "    infiniband:   [mac <MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "                  [transport-mode datagram | connected]\n"
+#~ "                  [parent <ifname>]\n"
+#~ "                  [p-key <IPoIB P_Key>]\n"
+#~ "\n"
+#~ "    bluetooth:    [addr <bluetooth address>]\n"
+#~ "                  [bt-type panu|dun-gsm|dun-cdma]\n"
+#~ "\n"
+#~ "    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+#~ "                  [id <VLAN id>]\n"
+#~ "                  [flags <VLAN flags>]\n"
+#~ "                  [ingress <ingress priority mapping>]\n"
+#~ "                  [egress <egress priority mapping>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+#~ "                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
+#~ "                  [miimon <num>]\n"
+#~ "                  [downdelay <num>]\n"
+#~ "                  [updelay <num>]\n"
+#~ "                  [arp-interval <num>]\n"
+#~ "                  [arp-ip-target <num>]\n"
+#~ "\n"
+#~ "    bond-slave:   master <master (ifname or connection UUID)>\n"
+#~ "\n"
+#~ "    team:         [config <json config>]\n"
+#~ "\n"
+#~ "    team-slave:   master <master (ifname or connection UUID)>\n"
+#~ "                  [config <json config>]\n"
+#~ "\n"
+#~ "    bridge:       [stp yes|no>]\n"
+#~ "                  [priority <num>]\n"
+#~ "                  [forward-delay <2-30>]\n"
+#~ "                  [hello-time <1-10>]\n"
+#~ "                  [max-age <6-40>]\n"
+#~ "                  [ageing-time <0-1000000>]\n"
+#~ "\n"
+#~ "    bridge-slave: master <master (ifname or connection UUID)\n"
+#~ "                  [priority <0-63>]\n"
+#~ "                  [path-cost <1-65535>]\n"
+#~ "                  [hairpin yes|no]\n"
+#~ "\n"
+#~ "    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#~ "                  [user <username>]\n"
+#~ "\n"
+#~ "    olpc-mesh:    ssid <SSID>\n"
+#~ "                  [channel <1-13>]\n"
+#~ "                  [dhcp-anycast <MAC address>]\n"
+#~ "\n"
+#~ "  IP_OPTIONS:\n"
+#~ "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+#~ "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+#~ msgstr ""
+#~ "使い方: nmcli connection add { オプション | help }\n"
+#~ "  オプション := 共通オプション タイプ固有オプション IP オプション\n"
+#~ "\n"
+#~ "  共通オプション:\n"
+#~ "                  type <type>\n"
+#~ "                  ifname <interface name> | \"*\"\n"
+#~ "                  [con-name <connection name>]\n"
+#~ "                  [autoconnect yes|no]\n"
+#~ "\n"
+#~ "  タイプ固有オプション:\n"
+#~ "    ethernet:     [mac <MAC address>]\n"
+#~ "                  [cloned-mac <cloned MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    wifi:         ssid <SSID>\n"
+#~ "                  [mac <MAC address>]\n"
+#~ "                  [cloned-mac <cloned MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    wimax:        [mac <MAC address>]\n"
+#~ "                  [nsp <NSP>]\n"
+#~ "\n"
+#~ "    gsm:          apn <APN>\n"
+#~ "                  [user <username>]\n"
+#~ "                  [password <password>]\n"
+#~ "\n"
+#~ "    cdma:         [user <username>]\n"
+#~ "                  [password <password>]\n"
+#~ "\n"
+#~ "    infiniband:   [mac <MAC address>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "                  [transport-mode datagram | connected]\n"
+#~ "                  [parent <ifname>]\n"
+#~ "                  [p-key <IPoIB P_Key>]\n"
+#~ "\n"
+#~ "    bluetooth:    [addr <bluetooth address>]\n"
+#~ "                  [bt-type panu|dun-gsm|dun-cdma]\n"
+#~ "\n"
+#~ "    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+#~ "                  [id <VLAN id>]\n"
+#~ "                  [flags <VLAN flags>]\n"
+#~ "                  [ingress <ingress priority mapping>]\n"
+#~ "                  [egress <egress priority mapping>]\n"
+#~ "                  [mtu <MTU>]\n"
+#~ "\n"
+#~ "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+#~ "                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
+#~ "                  [miimon <num>]\n"
+#~ "                  [downdelay <num>]\n"
+#~ "                  [updelay <num>]\n"
+#~ "                  [arp-interval <num>]\n"
+#~ "                  [arp-ip-target <num>]\n"
+#~ "\n"
+#~ "    bond-slave:   master <master (ifname or connection UUID)>\n"
+#~ "\n"
+#~ "    team:         [config <json config>]\n"
+#~ "\n"
+#~ "    team-slave:   master <master (ifname or connection UUID)>\n"
+#~ "                  [config <json config>]\n"
+#~ "\n"
+#~ "    bridge:       [stp yes|no>]\n"
+#~ "                  [priority <num>]\n"
+#~ "                  [forward-delay <2-30>]\n"
+#~ "                  [hello-time <1-10>]\n"
+#~ "                  [max-age <6-40>]\n"
+#~ "                  [ageing-time <0-1000000>]\n"
+#~ "\n"
+#~ "    bridge-slave: master <master (ifname or connection UUID)\n"
+#~ "                  [priority <0-63>]\n"
+#~ "                  [path-cost <1-65535>]\n"
+#~ "                  [hairpin yes|no]\n"
+#~ "\n"
+#~ "    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#~ "                  [user <username>]\n"
+#~ "\n"
+#~ "    olpc-mesh:    ssid <SSID>\n"
+#~ "                  [channel <1-13>]\n"
+#~ "                  [dhcp-anycast <MAC address>]\n"
+#~ "\n"
+#~ "  IP オプション:\n"
+#~ "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+#~ "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+
+#~ msgid "Error: 'list configured': %s"
+#~ msgstr "エラー: 'list configured': %s"
+
+#~ msgid "Error: 'list configured': %s; allowed fields: %s"
+#~ msgstr "エラー: 'list configured': %s; 許可フィールド: %s"
+
+#~ msgid "List of configured connections"
+#~ msgstr "設定されている接続の一覧"
+
+#~ msgid "Error: 'show configured': %s"
+#~ msgstr "エラー: 'show configured': %s"
+
+#~ msgid "Error: 'show configured': %s; allowed fields: %s"
+#~ msgstr "エラー: 'show configured': %s; 許可フィールド: %s"
+
+#~ msgid "Error: 'list active': %s"
+#~ msgstr "エラー: 'list active': %s"
+
+#~ msgid "Error: 'list active': %s; allowed fields: %s"
+#~ msgstr "エラー: 'list active': %s; 許可フィールド: %s"
+
+#~ msgid "List of active connections"
+#~ msgstr "アクティブな接続の一覧"
+
+#~ msgid "Error: 'show active': %s"
+#~ msgstr "エラー: 'show active': %s"
+
+#~ msgid "Error: 'show active': %s; allowed fields: %s"
+#~ msgstr "エラー: 'show active': %s; 許可フィールド: %s"
+
+#~ msgid "Error: Device '%s' is waiting for slaves before proceeding with activation."
+#~ msgstr "エラー: デバイス '%s' はアクティベートのプロセスを開始する前にスレーブを待機しています"
+
+#~ msgid "Connection (name, UUID, or path): "
+#~ msgstr "接続 (名前、UUID またはパス): "
+
+#~ msgid "Error: No connection specified."
+#~ msgstr "エラー: 接続が指定されていません。"
+
+#~ msgid "preparing"
+#~ msgstr "準備中"
+
+#~ msgid "Error: '%s': '%s' is not a valid %s MAC address."
+#~ msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+
+#~ msgid "InfiniBand"
+#~ msgstr "InfiniBand"
+
+#~ msgid "Ethernet"
+#~ msgstr "Ethernet"
+
+#~ msgid "Error: 'mtu': '%s' is not a valid MTU."
+#~ msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
+
+#~ msgid "Error: 'parent': '%s' is not a valid interface name."
+#~ msgstr "エラー: 'parent': '%s' は有効なインターフェース名ではありません。"
+
+#~ msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+#~ msgstr "エラー: 'p-key': '%s' は有効な InfiniBand P_KEY ではありません。"
+
+#~ msgid "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, connected]."
+#~ msgstr "エラー: 'mode': '%s' は有効な InfiniBand 転送モードではありません [datagram, connected]。"
+
+#~ msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+#~ msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
+
+#~ msgid "Error: '%s': '%s' is not valid; %s "
+#~ msgstr "エラー: '%s': '%s' は無効です; %s "
+
+#, fuzzy
+#~| msgid "Error: '%s': '%s' is not valid; use <%d-%d>."
+#~ msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+#~ msgstr "エラー: '%s': '%s' は無効です; <%d-%d> を使用してください。"
+
+#~ msgid "ethernet"
+#~ msgstr "Ethernet"
+
+#~ msgid "Wi-Fi"
+#~ msgstr "Wi-Fi"
+
+#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
+#~ msgstr "'%s ' 接続タイプには 3 種類のオプション引数があります。\n"
+
+#~ msgid "Do you want to provide them? (yes/no) [yes] "
+#~ msgstr "指定しますか? (yes/no) [yes] "
+
+#~ msgid "MTU [auto]: "
+#~ msgstr "MTU [auto]: "
+
+#~ msgid "MAC [none]: "
+#~ msgstr "MAC [none]: "
+
+#~ msgid "Cloned MAC [none]: "
+#~ msgstr "クローンの MAC [none]: "
+
+#~ msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
+#~ msgstr "'InfiniBand' 接続タイプには 5 種類のオプション引数があります。\n"
+
+#~ msgid "Transport mode (datagram or connected) [datagram]: "
+#~ msgstr "転送モード (datagram または connected) [datagram]: "
+
+#~ msgid "Parent interface [none]: "
+#~ msgstr "親インターフェース [none]: "
+
+#~ msgid "P_KEY [none]: "
+#~ msgstr "P_KEY [none]: "
+
+#~ msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+#~ msgstr "エラー: 'parent' を指定する場合、'p-key' は必須です。\n"
+
+#~ msgid "There is 1 optional argument for 'WiMax' connection type.\n"
+#~ msgstr "'WiMax' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "Do you want to provide it? (yes/no) [yes] "
+#~ msgstr "指定しますか? (yes/no) [yes] "
+
+#~ msgid "There are 2 optional arguments for 'mobile broadband' connection type.\n"
+#~ msgstr "'モバイルブロードバンド' 接続タイプには 2 種類のオプション引数があります。\n"
+
+#~ msgid "Username [none]: "
+#~ msgstr "ユーザー名 [none]: "
+
+#~ msgid "Password [none]: "
+#~ msgstr "パスワード [none]: "
+
+#~ msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
+#~ msgstr "'bluetooth' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
+#~ msgstr "Bluetooth タイプ (panu、dun-gsm、dun-cdma) [panu]: "
+
+#~ msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+#~ msgstr "エラー: ''bt-type': '%s' は有効な bluetooth タイプではありません。\n"
+
+#~ msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
+#~ msgstr "'VLAN' 接続タイプには 4 種類のオプション引数があります。\n"
+
+#~ msgid "VLAN flags (<0-7>) [none]: "
+#~ msgstr "VLAN フラグ (<0-7>) [none]: "
+
+#~ msgid "Ingress priority maps [none]: "
+#~ msgstr "イングレス優先度マップ [none]: "
+
+#~ msgid "Egress priority maps [none]: "
+#~ msgstr "イーグレス優先度マップ [none]: "
+
+#~ msgid "There are 6 optional arguments for 'bond' connection type.\n"
+#~ msgstr "'ボンド' 接続タイプには 6 種類のオプション引数があります。\n"
+
+#~ msgid "Bonding mode [balance-rr]: "
+#~ msgstr "ボンドモード [balance-rr]: "
+
+#~ msgid "Bonding miimon [100]): "
+#~ msgstr "ボンド miimon [100]): "
+
+#, fuzzy
+#~| msgid "Error: 'miimon': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "エラー: 'miimon': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding downdelay [0]): "
+#~ msgstr "ボンド downdelay [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'downdelay': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "エラー: 'downdelay': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding updelay [0]): "
+#~ msgstr "ボンド  updelay [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'updelay': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "Error: 'updelay': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding arp-interval [0]): "
+#~ msgstr "ボンド arp-interval [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'arp-interval': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "Error: 'arp-interval': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding arp-ip-target [none]): "
+#~ msgstr "ボンド  arp-ip-target [none]): "
+
+#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
+#~ msgstr "'ブリッジ' 接続タイプには 6 種類のオプション引数があります。\n"
+
+#~ msgid "Enable STP (yes/no) [yes]: "
+#~ msgstr "STP の有効化 (yes/no) [yes]: "
+
+#~ msgid "Error: 'stp': '%s'.\n"
+#~ msgstr "エラー:'stp': %s。\n"
+
+#~ msgid "STP priority [128]): "
+#~ msgstr "STP 優先度 [128]): "
+
+#~ msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+#~ msgstr "エラー: '優先度': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Forward delay [15]): "
+#~ msgstr "フォワード遅延 [15]): "
+
+#~ msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+#~ msgstr "エラー: 'フォワード遅延': '%s' は有効な数値ではありません <2-30>。\n"
+
+#~ msgid "Hello time [2]): "
+#~ msgstr "Hello タイム [2]): "
+
+#~ msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+#~ msgstr "エラー: 'hello タイム': '%s' は有効な数値ではありません <1-10>。\n"
+
+#~ msgid "Max age [20]): "
+#~ msgstr "最大エイジ [20]): "
+
+#~ msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+#~ msgstr "エラー: '最大エイジ': '%s' は有効な数値ではありません <6-40>。\n"
+
+#~ msgid "MAC address ageing time [300]): "
+#~ msgstr "MAC アドレスエージングタイム [300]): "
+
+#~ msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+#~ msgstr "エラー: 'エージングタイム': '%s' は有効な数値ではありません <0-1000000>。\n"
+
+#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
+#~ msgstr "'ブリッジスレーブ' 接続タイプには 3 種類のオプション引数があります。\n"
+
+#~ msgid "Bridge port priority [32]): "
+#~ msgstr "ブリッジポート優先度 [32]): "
+
+#~ msgid "Bridge port STP path cost [100]): "
+#~ msgstr "ブリッジポート STP パスコスト [100]): "
+
+#~ msgid "Hairpin (yes/no) [yes]: "
+#~ msgstr "ヘアピン (yes/no) [yes]: "
+
+#~ msgid "Error: 'hairpin': '%s'.\n"
+#~ msgstr "エラー: 'ヘアピン': '%s'。\n"
+
+#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
+#~ msgstr "'VPN' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
+#~ msgstr "’OLPC メッシュ' 接続タイプには 2 種類のオプション引数があります。\n"
+
+#~ msgid "OLPC Mesh channel [1]): "
+#~ msgstr "OLPC メッシュチャンネル [1]): "
+
+#~ msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+#~ msgstr "エラー: 'channel': '%s' は有効な数値ではありません <1-13>。\n"
+
+#~ msgid "DHCP anycast MAC address [none]: "
+#~ msgstr "DHCP anycast MAC アドレス [none]: "
+
+#~ msgid "Do you want to add IP addresses? (yes/no) [yes] "
+#~ msgstr "IP アドレスを追加しますか? (yes/no) [yes] "
+
+#~ msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+#~ msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
+
+#~ msgid "Error: "
+#~ msgstr "エラー: "
+
+#~ msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+#~ msgstr "IPv6 address (IP[/plen] [gateway]) [none]: "
+
+#~ msgid "Error: 'parent': not valid without 'p-key'."
+#~ msgstr "エラー: '親': 'p-key' がないと使用できません。"
+
+#~ msgid "SSID: "
+#~ msgstr "SSID: "
+
+#~ msgid "Error: 'ssid' is required."
+#~ msgstr "エラー: 'ssid' が必要です。"
+
+#~ msgid "WiMAX NSP name: "
+#~ msgstr "WiMAX NSP 名: "
+
+#~ msgid "Error: 'nsp' is required."
+#~ msgstr "エラー: 'nsp' が必要です。"
+
+#~ msgid "APN: "
+#~ msgstr "APN: "
+
+#~ msgid "Error: 'apn' is required."
+#~ msgstr "エラー: 'apn' が必要です。"
+
+#~ msgid "Bluetooth device address: "
+#~ msgstr "Bluetooth デバイスアドレス: "
+
+#~ msgid "Error: 'addr' is required."
+#~ msgstr "エラー: 'addr' が必要です。"
+
+#~ msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+#~ msgstr "エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
+
+#~ msgid "VLAN parent device or connection UUID: "
+#~ msgstr "VLAN 親デバイスまたは接続 UUID: "
+
+#~ msgid "Error: 'dev' is required."
+#~ msgstr "エラー: 'dev' が必要です。"
+
+#~ msgid "VLAN ID <0-4095>: "
+#~ msgstr "VLAN ID <0-4095>: "
+
+#~ msgid "Error: 'id' is required."
+#~ msgstr "エラー: 'id' が必要です。"
+
+#~ msgid "Error: 'id': '%s' is not valid; use <0-4095>."
+#~ msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
+
+#~ msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+#~ msgstr "エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
+
+#~ msgid "Error: 'mode': %s."
+#~ msgstr "エラー: 'モード': %s。"
+
+#~ msgid "Bond master: "
+#~ msgstr "ボンドマスター: "
+
+#~ msgid "Error: 'master' is required."
+#~ msgstr "エラー: 'マスター' が必要です。"
+
+#~ msgid "Warning: 'type' is currently ignored. We only support ethernet slaves for now.\n"
+#~ msgstr "警告: 現在、'タイプ' は無視されています。対応しているのは Ethernet スレーブのみになります。\n"
+
+#~ msgid "Team master: "
+#~ msgstr "チームマスター: "
+
+#~ msgid "Bridge master: "
+#~ msgstr "ブリッジマスター: "
+
+#~ msgid "Error: 'master': '%s' is not valid UUID nor interface."
+#~ msgstr "エラー: 'マスター': '%s' は有効な UUID でもインターフェースでもありません。"
+
+#~ msgid "Error: 'hairpin': %s."
+#~ msgstr "エラー: 'ヘアピン': %s。"
+
+#~ msgid "VPN type: "
+#~ msgstr "VPN タイプ: "
+
+#~ msgid "Error: 'vpn-type' is required."
+#~ msgstr "エラー: ’vpn タイプ’ が必要です。"
+
+#~ msgid "Error: 'vpn-type': %s."
+#~ msgstr "エラー: 'vpn タイプ': %s。"
+
+#~ msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+#~ msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
+
+#~ msgid "Error: '%s' is a not valid connection type."
+#~ msgstr "エラー: '%s' は無効な接続タイプです。"
+
+#~ msgid "Error: Failed to add '%s' connection: (%d) %s"
+#~ msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+
+#~ msgid "Connection '%s' (%s) successfully added.\n"
+#~ msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+
+#~ msgid "Connection type: "
+#~ msgstr "接続タイプ: "
+
+#~ msgid "Error: 'type' argument is required."
+#~ msgstr "エラー: 'タイプ' 引数が必要です。"
+
+#~ msgid "Error: invalid connection type; %s."
+#~ msgstr "エラー: 無効な接続タイプ; %s。"
+
+#~ msgid "Error: 'autoconnect': %s."
+#~ msgstr "エラー: '自動接続': %s。"
+
+#~ msgid "Interface name [*]: "
+#~ msgstr "インターフェース名 [*]: "
+
+#~ msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+#~ msgstr "エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+
+#~ msgid "['%s' setting values]\n"
+#~ msgstr "['%s' 設定値]\n"
+
+#~ msgid ""
+#~ "---[ Main menu ]---\n"
+#~ "goto     [<setting> | <prop>]        :: go to a setting or property\n"
+#~ "remove   <setting>[.<prop>] | <prop> :: remove setting or reset property value\n"
+#~ "set      [<setting>.<prop> <value>]  :: set property value\n"
+#~ "describe [<setting>.<prop>]          :: describe property\n"
+#~ "print    [all]                       :: print the connection\n"
+#~ "verify   [all]                       :: verify the connection\n"
+#~ "save                                 :: save the connection\n"
+#~ "back                                 :: go one level up (back)\n"
+#~ "help/?   [<command>]                 :: print this help\n"
+#~ "nmcli    <conf-option> <value>       :: nmcli configuration\n"
+#~ "quit                                 :: exit nmcli\n"
+#~ msgstr ""
+#~ "---[ メインメニュー ]---\n"
+#~ "goto     [<setting> | <prop>]        :: 設定またはプロパティへ移動\n"
+#~ "remove   <setting>[.<prop>] | <prop> :: 設定の削除またはプロパティ値のリセット\n"
+#~ "set      [<setting>.<prop> <value>]  :: プロパティ値の設定\n"
+#~ "describe [<setting>.<prop>]          :: プロパティの詳細表示\n"
+#~ "print    [all]                       :: 接続の表示\n"
+#~ "verify   [all]                       :: 接続の確認\n"
+#~ "save                                 :: 接続の保存\n"
+#~ "back                                 :: 一つ上のレベルに移動 (戻る)\n"
+#~ "help/?   [<command>]                 :: このヘルプを表示\n"
+#~ "nmcli    <conf-option> <value>       :: nmcli 設定\n"
+#~ "quit                                 :: nmcli の終了\n"
+
+#~ msgid ""
+#~ "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editation\n"
+#~ "\n"
+#~ "This command enters into a setting or property for editing it.\n"
+#~ "\n"
+#~ "Examples: nmcli> goto connection\n"
+#~ "          nmcli connection> goto secondaries\n"
+#~ "          nmcli> goto ipv4.addresses\n"
+#~ msgstr ""
+#~ "goto <setting>[.<prop>] | <prop>  :: 設定/プロパティを入力して変更\n"
+#~ "\n"
+#~ "設定やプロパティの変更モードに入ります。\n"
+#~ "\n"
+#~ "例: nmcli> goto connection\n"
+#~ "          nmcli connection> goto secondaries\n"
+#~ "          nmcli> goto ipv4.addresses\n"
+
+#~ msgid ""
+#~ "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
+#~ "\n"
+#~ "This command removes an entire setting from the connection, or if a property\n"
+#~ "is given, resets that property to the default value.\n"
+#~ "\n"
+#~ "Examples: nmcli> remove wifi-sec\n"
+#~ "          nmcli> remove eth.mtu\n"
+#~ msgstr ""
+#~ "remove <setting>[.<prop>]  :: 設定の削除またはプロパティ値のリセット\n"
+#~ "\n"
+#~ "接続から全設定を削除します。または、プロパティを指定している場合には\n"
+#~ "そのプロパティをデフォルト値としてリセットします。\n"
+#~ "\n"
+#~ "例: nmcli> remove wifi-sec\n"
+#~ "          nmcli> remove eth.mtu\n"
+
+#~ msgid ""
+#~ "set [<setting>.<prop> <value>]  :: set property value\n"
+#~ "\n"
+#~ "This command sets property value.\n"
+#~ "\n"
+#~ "Example: nmcli> s con.id My connection\n"
+#~ msgstr ""
+#~ "set [<setting>.<prop> <value>]  :: プロパティ値の設定\n"
+#~ "\n"
+#~ "プロパティ値を設定します。\n"
+#~ "\n"
+#~ "例: nmcli> s con.id My connection\n"
+
+#~ msgid ""
+#~ "describe [<setting>.<prop>]  :: describe property\n"
+#~ "\n"
+#~ "Shows property description. You can consult nm-settings(5) manual page to see all NM settings and properties.\n"
+#~ msgstr ""
+#~ "set [<setting>.<prop> <value>]  :: プロパティ値の設定\n"
+#~ "\n"
+#~ "プロパティ値を設定します。\n"
+#~ "\n"
+#~ "例: nmcli> s con.id My connection\n"
+
+#~ msgid ""
+#~ "print [all]  :: print setting or connection values\n"
+#~ "\n"
+#~ "Shows current property or the whole connection.\n"
+#~ "\n"
+#~ "Example: nmcli ipv4> print all\n"
+#~ msgstr ""
+#~ "print [all]  :: 設定または接続値の表示\n"
+#~ "\n"
+#~ "現在のプロパティまたは接続全体を表示します。\n"
+#~ "\n"
+#~ "例: nmcli ipv4> print all\n"
+
+#~ msgid ""
+#~ "verify [all]  :: verify setting or connection validity\n"
+#~ "\n"
+#~ "Verifies whether the setting or connection is valid and can be saved later. It indicates invalid values on error.\n"
+#~ "\n"
+#~ "Examples: nmcli> verify\n"
+#~ "          nmcli bond> verify\n"
+#~ msgstr ""
+#~ "verify [all]  :: 設定または接続の有効性の確認\n"
+#~ "\n"
+#~ "設定または接続が有効かどうかを確認し、あとで保存することができます。エラーの場合には無効な値を表示します。\n"
+#~ "\n"
+#~ "例: nmcli> verify\n"
+#~ "          nmcli bond> verify\n"
+
+#~ msgid ""
+#~ "save  :: save the connection\n"
+#~ "\n"
+#~ "Sends the connection to NetworkManager that will save it.\n"
+#~ msgstr ""
+#~ "save  :: 接続の保存\n"
+#~ "\n"
+#~ "接続を保存する NetworkManager にこの接続を送信します。\n"
+
+#~ msgid ""
+#~ "back  :: go to upper menu level\n"
+#~ "\n"
+#~ msgstr ""
+#~ "back  :: 一つ上のメニューレベルに移動\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "help/? [<command>]  :: help for the nmcli commands\n"
+#~ "\n"
+#~ msgstr ""
+#~ "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
+#~ "\n"
+#~ "Configures nmcli. The following options are available:\n"
+#~ "status-line yes | no        [default: no]\n"
+#~ "save-confirmation yes | no  [default: yes]\n"
+#~ "prompt-color <0-8>          [default: 0]\n"
+#~ "  0 = normal\n"
+#~ "  1 = black\n"
+#~ "  2 = red\n"
+#~ "  3 = green\n"
+#~ "  4 = yellow\n"
+#~ "  5 = blue\n"
+#~ "  6 = magenta\n"
+#~ "  7 = cyan\n"
+#~ "  8 = white\n"
+#~ "\n"
+#~ "Examples: nmcli> nmcli status-line yes\n"
+#~ "          nmcli> nmcli save-confirmation no\n"
+#~ "          nmcli> nmcli prompt-color 3\n"
+#~ msgstr ""
+#~ "nmcli [<conf-option> <value>]  :: nmcli 設定\n"
+#~ "\n"
+#~ "nmcli の設定を行ないます。次のオプションが使用可能です。\n"
+#~ "status-line yes | no        [デフォルト: no]\n"
+#~ "save-confirmation yes | no  [デフォルト: yes]\n"
+#~ "prompt-color <0-8>          [デフォルト: 0]\n"
+#~ "  0 = normal\n"
+#~ "  1 = black\n"
+#~ "  2 = red\n"
+#~ "  3 = green\n"
+#~ "  4 = yellow\n"
+#~ "  5 = blue\n"
+#~ "  6 = magenta\n"
+#~ "  7 = cyan\n"
+#~ "  8 = white\n"
+#~ "\n"
+#~ "例: nmcli> nmcli status-line yes\n"
+#~ "          nmcli> nmcli save-confirmation no\n"
+#~ "          nmcli> nmcli prompt-color 3\n"
+
+#~ msgid ""
+#~ "quit  :: exit nmcli\n"
+#~ "\n"
+#~ "This command exits nmcli. When the connection being edited is not saved, the user is asked to confirm the action.\n"
+#~ msgstr ""
+#~ "quit  :: nmcli の終了\n"
+#~ "\n"
+#~ "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が求められます。\n"
+
+#~ msgid "Unknown command: '%s'\n"
+#~ msgstr "不明なコマンド: '%s'\n"
+
+#~ msgid ""
+#~ "---[ Property menu ]---\n"
+#~ "set      [<value>]               :: set new value\n"
+#~ "add      [<value>]               :: add new option to the property\n"
+#~ "change                           :: change current value\n"
+#~ "remove   [<index> | <option>]    :: delete the value\n"
+#~ "describe                         :: describe property\n"
+#~ "print    [setting | connection]  :: print property (setting/connection) value(s)\n"
+#~ "back                             :: go to upper level\n"
+#~ "help/?   [<command>]             :: print this help or command description\n"
+#~ "quit                             :: exit nmcli\n"
+#~ msgstr ""
+#~ "---[ プロパティメニュー]---\n"
+#~ "set      [<value>]               :: 新しい値の設定\n"
+#~ "add      [<value>]               :: プロパティに新規オプションを追加\n"
+#~ "change                           :: 現在の値を変更\n"
+#~ "remove   [<index> | <option>]    :: 値の削除\n"
+#~ "describe                         :: プロパティの詳細表示\n"
+#~ "print    [setting | connection]  :: プロパティ値 (設定/接続) の表示\n"
+#~ "back                             :: 上のレベルに移動\n"
+#~ "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
+#~ "quit                             :: nmcli の終了\n"
+
+#~ msgid ""
+#~ "set [<value>]  :: set new value\n"
+#~ "\n"
+#~ "This command sets provided <value> to this property\n"
+#~ msgstr ""
+#~ "set [<value>]  :: 新しい値の設定\n"
+#~ "\n"
+#~ "このプロパティに指定した <value> を設定します。\n"
+
+#~ msgid ""
+#~ "add [<value>]  :: add new option to the property\n"
+#~ "\n"
+#~ "This command add provided <value> to this property, if the property is of a container type. For single-valued properties it replaces the value (same as 'set').\n"
+#~ msgstr ""
+#~ "add [<value>]  :: プロパティに新規オプションを追加\n"
+#~ "\n"
+#~ "このプロパティのタイプがコンテナーの場合、指定した <value> を追加します。単一値のプロパティの場合はその値が置換されます ('set' と同じ)。\n"
+
+#~ msgid ""
+#~ "change  :: change current value\n"
+#~ "\n"
+#~ "Displays current value and allows editing it.\n"
+#~ msgstr ""
+#~ "change  :: 現在の値を変更\n"
+#~ "\n"
+#~ "現在の値を表示し、その値を変更することができます。\n"
+
+#~ msgid ""
+#~ "remove [<index>|<option>]  :: delete the value\n"
+#~ "\n"
+#~ "Removes the property value (sets it to default).\n"
+#~ msgstr ""
+#~ "remove [<index>|<option>]  :: 値の削除\n"
+#~ "\n"
+#~ "プロパティ値を削除します (プロパティ値をデフォルトに戻す)。\n"
+
+#~ msgid ""
+#~ "describe  :: describe property\n"
+#~ "\n"
+#~ "Shows property description. You can consult nm-settings(5) manual page to see all NM settings and properties.\n"
+#~ msgstr ""
+#~ "describe  :: プロパティの詳細表示\n"
+#~ "\n"
+#~ "プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) man ページを参照してください。\n"
+
+#~ msgid ""
+#~ "print [property|setting|connection]  :: print property (setting, connection) value(s)\n"
+#~ "\n"
+#~ "Shows property value. Providing an argument you can also display values for the whole setting or connection.\n"
+#~ msgstr ""
+#~ "print [property|setting|connection]  :: プロパティ値の表示 (設定、接続)\n"
+#~ "\n"
+#~ "プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させることもできます。\n"
+
+#~ msgid ""
+#~ "help/? [<command>]  :: help for nmcli commands\n"
+#~ "\n"
+#~ msgstr ""
+#~ "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+#~ "\n"
+
+#~ msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
+#~ msgstr "エラー: 設定 '%s' は必須のため削除できません。\n"
+
+#~ msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+#~ msgstr "[ 接続タイプ: %s | name: %s | UUID: %s | dirty: %s ]\n"
+
+#~ msgid "Enter '%s' value: "
+#~ msgstr "'%s' 値を入力してください: "
+
+#~ msgid "Error: failed to set '%s' property: %s\n"
+#~ msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
+
+#~ msgid "Edit '%s' value: "
+#~ msgstr "'%s' 値の編集: "
+
+#~ msgid "Error: %s\n"
+#~ msgstr "エラー: %s\n"
+
+#~ msgid "Error: failed to remove value of '%s': %s\n"
+#~ msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
+
+#~ msgid "Unknown command argument: '%s'\n"
+#~ msgstr "不明なコマンド引数: '%s'\n"
+
+#~ msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
+#~ msgstr "この接続は保存されません。本当に終了してよいですか? [y/n]\n"
+
+#~ msgid "Available settings: %s\n"
+#~ msgstr "使用可能な設定: %s\n"
+
+#~ msgid "Error: invalid setting name; %s\n"
+#~ msgstr "エラー: 無効な設定名; %s\n"
+
+#~ msgid "Available properties: %s\n"
+#~ msgstr "使用可能なプロパティ: %s\n"
+
+#~ msgid "Error: property %s\n"
+#~ msgstr "エラー: プロパティ %s\n"
+
+#~ msgid ""
+#~ "Saving the connection with 'autoconnect=yes'. That might result in an immediate activation of the connection.\n"
+#~ "Do you still want to save? [yes] "
+#~ msgstr ""
+#~ "'autoconnect=yes' でこの接続を保存しています。これにより直ちに接続がアクティベートされる可能性があります。\n"
+#~ "本当に保存しますか? [yes] "
+
+#~ msgid "You may edit the following settings: %s\n"
+#~ msgstr "次の設定を変更することができます: %s\n"
+
+#~ msgid "Allowed values for '%s' property: %s\n"
+#~ msgstr "'%s' プロパティに対して許可されている値: %s\n"
+
+#~ msgid "Error: no setting selected; valid are [%s]\n"
+#~ msgstr "エラー: 設定が選択されていません; 有効な設定は [%s] になります\n"
+
+#~ msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
+#~ msgstr "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用してください。\n"
+
+#~ msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
+#~ msgstr "エラー: 無効な設定引数 %s です; [%s] が有効な引数になります\n"
+
+#~ msgid "Error: missing setting for '%s' property\n"
+#~ msgstr "エラー: '%s' プロパティ用の設定がありません\n"
+
+#~ msgid "Error: invalid property: %s\n"
+#~ msgstr "エラー: 無効なプロパティ: %s\n"
+
+#~ msgid "Error: unknown setting '%s'\n"
+#~ msgstr "エラー: 不明な設定 '%s'\n"
+
+#~ msgid "You may edit the following properties: %s\n"
+#~ msgstr "変更できるのは次のプロパティになります: %s\n"
+
+#~ msgid "Error: no argument given; valid are [%s]\n"
+#~ msgstr "エラー: 引数が指定されていません; [%s] が有効な引数になります\n"
+
+#~ msgid "Setting '%s' is not present in the connection.\n"
+#~ msgstr "この接続には設定 '%s' はありません。\n"
+
+#~ msgid "Error: %s properties, nor it is a setting name.\n"
+#~ msgstr "エラー: %s プロパティ、設定名でもありません。\n"
+
+#~ msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
+#~ msgstr "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使用してください\n"
+
+#~ msgid "Error: invalid property: %s, neither a valid setting name.\n"
+#~ msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
+
+#~ msgid "Error: '%s' setting not present\n"
+#~ msgstr "エラー: '%s' 設定はありません\n"
+
+#~ msgid "Error: unknown setting: '%s'\n"
+#~ msgstr "エラー: 不明な設定: '%s'\n"
+
+#~ msgid "Verify setting '%s': %s\n"
+#~ msgstr "設定 '%s' の確認: %s\n"
+
+#~ msgid "Verify connection: %s\n"
+#~ msgstr "接続の確認: %s\n"
+
+#~ msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n"
+#~ msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: (%d) %s\n"
+
+#~ msgid "Connection '%s' (%s) sucessfully saved.\n"
+#~ msgstr "接続 '%s' (%s) が正常に保存されました。\n"
+
+#~ msgid "Error: connection verification failed: %s\n"
+#~ msgstr "エラー: 接続の確認に失敗しました: %s\n"
+
+#~ msgid "(unknown error)"
+#~ msgstr "(不明なエラー)"
+
+#~ msgid "Error: status-line: %s\n"
+#~ msgstr "エラー: status-line: %s\n"
+
+#~ msgid "Error: save-confirmation: %s\n"
+#~ msgstr "エラー: save-confirmation: %s\n"
+
+#~ msgid "Error: bad color number: '%s'; use <0-8>\n"
+#~ msgstr "エラー: 色番号が正しくありません: '%s'; <0-8> を使用してください\n"
+
+#~ msgid "Current nmcli configuration:\n"
+#~ msgstr "現在の nmcli 設定:\n"
+
+#~ msgid "Invalid configuration option '%s'; allowed [%s]\n"
+#~ msgstr "無効な設定オプション '%s'; [%s] が許可されています\n"
+
+#~ msgid ""
+#~ ">>> Command-line editing is not available. Consider installing a line editing library to enable the feature. <<<\n"
+#~ "Supported libraries are:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
+#~ msgstr ""
+#~ ">>> コマンドライン編集は使用できません。この機能を有効にする場合は、ライン編集ライブラリのインストールを検討してください。 <<<\n"
+#~ "対応ライブラリは次の通りです:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
+
+#~ msgid "Error: only one of 'id', uuid, or 'path' can be provided."
+#~ msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
+
+#~ msgid "Error: Unknown connection '%s'."
+#~ msgstr "エラー: 不明な接続 '%s' です。"
+
+#~ msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
+#~ msgstr "警告: 既存の接続 '%s' を編集しています;  'タイプ' 引数は無視されます\n"
+
+#~ msgid "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
+#~ msgstr "警告: 既存の接続 '%s' を編集しています; 'con 名' 引数は無視されます\n"
+
+#~ msgid "Valid connection types: %s\n"
+#~ msgstr "有効な接続タイプ: %s\n"
+
+#~ msgid "Error: invalid connection type; %s\n"
+#~ msgstr "エラー: 無効な接続タイプ; %s\n"
+
+#~ msgid "===| nmcli interactive connection editor |==="
+#~ msgstr "===| nmcli インテラクティブ接続エディター |==="
+
+#~ msgid "Editing existing '%s' connection: '%s'"
+#~ msgstr "既存の '%s' 接続を編集中: '%s'"
+
+#~ msgid "Adding a new '%s' connection"
+#~ msgstr "新規の '%s' 接続を追加中"
+
+#~ msgid "Type 'help' or '?' for available commands."
+#~ msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
+
+#~ msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
+#~ msgstr "プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
+
+#~ msgid "Error: Failed to modify connection '%s': (%d) %s"
+#~ msgstr "エラー: 接続 '%s' の変更に失敗しました: (%d) %s"
+
+#~ msgid "Connection '%s' (%s) successfully modified.\n"
+#~ msgstr "接続 '%s' (%s) が正常に変更されました。\n"
+
+#~ msgid "Error: No arguments provided."
+#~ msgstr "エラー: 引数がありません。"
+
+#~ msgid "Error: connection ID is missing."
+#~ msgstr "エラー: 接続 ID がありません。"
+
+#~ msgid "Error: <setting>.<property> argument is missing."
+#~ msgstr "エラー: <setting>.<property> 引数がありません。"
+
+#~ msgid "Error: invalid <setting>.<property> '%s'."
+#~ msgstr "エラー: 無効な <setting>.<property> '%s' です。"
+
+#~ msgid "Error: invalid or not allowed setting '%s': %s."
+#~ msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
+
+#~ msgid "Error: invalid property '%s': %s."
+#~ msgstr "エラー: 無効なプロパティ '%s': %s。"
+
+#~ msgid "Error: failed to modify %s.%s: %s."
+#~ msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+
+#~ msgid "Error: unknown connection: %s\n"
+#~ msgstr "エラー: 不明な接続です: %s\n"
+
+#~ msgid "Error: cannot delete unknown connection(s): %s."
+#~ msgstr "エラー: 不明な接続を削除できません: %s。"
+
+#~ msgid "Error: 'configured' or 'active' command is expected for 'connection show'."
+#~ msgstr "エラー: 'connection show' には 'configured' または 'active' コマンドの使用が期待されています。"
+
+#~ msgid "Error: '%s' is not valid 'connection' command."
+#~ msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
+
+#~ msgid "SSID-HEX"
+#~ msgstr "SSID-HEX"
+
+#~ msgid "CHAN"
+#~ msgstr "CHAN"
+
+#~ msgid "BARS"
+#~ msgstr "バー"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "WPA1"
+#~ msgstr "WPA1"
+
+#~ msgid "802.1X"
+#~ msgstr "802.1X"
+
+#~ msgid "Infra"
+#~ msgstr "インフラ"
+
+#~ msgid "Error: 'device show': %s"
+#~ msgstr "エラー: 'device show': %s"
+
+#~ msgid "Error: 'device show': %s; allowed fields: %s"
+#~ msgstr "エラー: 'device show': %s; 許可フィールド: %s"
+
+#~ msgid "Interface: "
+#~ msgstr "インターフェース: "
+
+#~ msgid "Error: No interface specified."
+#~ msgstr "エラー: インターフェースが指定されていません。"
+
+#~ msgid "Error: extra argument not allowed: '%s'."
+#~ msgstr "エラー: 追加の引数は許可されていません: '%s'。"
+
+#~ msgid "SSID or BSSID: "
+#~ msgstr "SSID または BSSID: "
+
+#~ msgid "Password: "
+#~ msgstr "パスワード: "
+
+#~ msgid "CONNECTIVITY"
+#~ msgstr "接続性"
+
+#~ msgid "NETWORKING"
+#~ msgstr "ネットワーキング"
+
+#~ msgid "WIFI-HW"
+#~ msgstr "WIFI ハードウェア"
+
+#~ msgid "WWAN-HW"
+#~ msgstr "WWAN ハードウェア"
+
+#~ msgid "WIMAX-HW"
+#~ msgstr "WIMAX ハードウェア"
+
+#~ msgid "LEVEL"
+#~ msgstr "レベル"
+
+#~ msgid "DOMAINS"
+#~ msgstr "ドメイン"
+
+#~ msgid ""
+#~ "Usage: nmcli general { COMMAND | help }\n"
+#~ "\n"
+#~ "  COMMAND := { status | permissions | logging }\n"
+#~ "\n"
+#~ "  status\n"
+#~ "\n"
+#~ "  permissions\n"
+#~ "\n"
+#~ "  logging [level <log level>] [domains <log domains>]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: nmcli general { コマンド | help }\n"
+#~ "\n"
+#~ "  コマンド := { status | permissions | logging }\n"
+#~ "\n"
+#~ "  status\n"
+#~ "\n"
+#~ "  permissions\n"
+#~ "\n"
+#~ "  logging [level <log level>] [domains <log domains>]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: nmcli networking { COMMAND | help }\n"
+#~ "\n"
+#~ "  COMMAND := { on | off | connectivity }\n"
+#~ "\n"
+#~ "  on\n"
+#~ "\n"
+#~ "  off\n"
+#~ "\n"
+#~ "  connectivity [check]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方 : nmcli networking { コマンド | help }\n"
+#~ "\n"
+#~ "  コマンド := { on | off | connectivity }\n"
+#~ "\n"
+#~ "  on\n"
+#~ "\n"
+#~ "  off\n"
+#~ "\n"
+#~ "  connectivity [check]\n"
+#~ "\n"
+
+#~ msgid "portal"
+#~ msgstr "ポータル"
+
+#~ msgid "limited"
+#~ msgstr "制限付き"
+
+#~ msgid "full"
+#~ msgstr "完全"
+
+#~ msgid "Error: %s"
+#~ msgstr "エラー: %s"
+
+#~ msgid "Error: %s (allowed fields: %s)"
+#~ msgstr "エラー: %s (許可フィールド: %s)"
+
+#, fuzzy
+#~| msgid "activating"
+#~ msgid "starting"
+#~ msgstr "アクティベート中"
+
+#~ msgid "Error: 'general logging': %s"
+#~ msgstr "エラー: 'general logging': %s"
+
+#~ msgid "Error: 'general logging': %s; allowed fields: %s"
+#~ msgstr "エラー: 'general logging': %s; 許可フィールド: %s"
+
+#~ msgid "NetworkManager logging"
+#~ msgstr "NetworkManager のロギング"
+
+#~ msgid "Error: access denied to set logging; %s"
+#~ msgstr "エラー: ロギング設定のアクセスが拒否されました; %s"
+
+#~ msgid "Error: 'general' command '%s' is not valid."
+#~ msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
+
+#~ msgid "Connectivity"
+#~ msgstr "接続性"
+
+#~ msgid "Error: 'networking connectivity' command '%s' is not valid."
+#~ msgstr "エラー: 'networking connectivity' のコマンド '%s' は有効なコマンドではありません。"
+
+#~ msgid "Error: 'networking' command '%s' is not valid."
+#~ msgstr "エラー: 'networking' のコマンド '%s' は有効なコマンドではありません。"
+
+#~ msgid "Radio switches"
+#~ msgstr "ラジオスイッチ"
+
+#~ msgid "Wi-Fi radio switch"
+#~ msgstr "Wi-Fi ラジオスイッチ"
+
+#~ msgid "WWAN radio switch"
+#~ msgstr "WWAN ラジオスイッチ"
+
+#~ msgid "WiMAX radio switch"
+#~ msgstr "WiMAX ラジオスイッチ"
+
+#~ msgid "Error: '%s' is not a valid timeout for '%s' option."
+#~ msgstr "エラー: '%s' は '%s' オプションの有効なタイムアウトではありません。"
+
+#~ msgid "default"
+#~ msgstr "デフォルト"
+
+#~ msgid "Do you also want to set '%s' to '%s'? [yes]: "
+#~ msgstr "'%s' を '%s' に設定しますか? [yes]: "
+
+#~ msgid "Do you also want to clear '%s'? [yes]: "
+#~ msgstr "'%s' も消去しますか? [yes]: "
+
+#~ msgid "'%s' is not valid"
+#~ msgstr "'%s' は無効です"
+
+#~ msgid "'%d' is not valid; use <%d-%d>"
+#~ msgstr "'%d' は無効です; <%d-%d> を使用してください"
+
+#~ msgid "'%u' is not valid; use <%d-%d>"
+#~ msgstr "'%u' は無効です; <%d-%d> を使用してください"
+
+#~ msgid "'%s' is not valid; use <option>=<value>"
+#~ msgstr "'%s' は無効です; <option>=<value> を使用してください"
+
+#~ msgid "index '%s' is not valid"
+#~ msgstr "インデックス '%s' は無効です"
+
+#~ msgid "no item to remove"
+#~ msgstr "削除するアイテムがありません"
+
+#~ msgid "index '%d' is not in range <0-%d>"
+#~ msgstr "インデックス '%d' は範囲内にありません <0-%d>"
+
+#~ msgid "invalid option '%s'"
+#~ msgstr "無効なオプション '%s'"
+
+#~ msgid "missing option"
+#~ msgstr "足りないオプション"
+
+#~ msgid "'%s' is not a valid number (or out of range)"
+#~ msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
+
+#~ msgid "'%s' is not a valid Ethernet MAC"
+#~ msgstr "'%s' は有効な Ethernet MAC ではありません"
+
+#~ msgid "'%s' is not a valid interface name"
+#~ msgstr "'%s' は有効なインターフェース名ではありません"
+
+#~ msgid "'%s' is not a number"
+#~ msgstr "'%s' は数字ではありません"
+
+#~ msgid "'%s' is not a valid hex character"
+#~ msgstr "'%s' は有効な 16 進文字ではありません"
+
+#~ msgid "'%s' is not a valid MAC"
+#~ msgstr "'%s' は有効な MAC ではありません"
+
+#~ msgid "'%s' is not a valid UUID"
+#~ msgstr "'%s' は有効な UUID ではありません"
+
+#~ msgid ""
+#~ "Enter a list of user permissions. This is a list of user names formatted as:\n"
+#~ "  [user:]<user name 1>, [user:]<user name 2>,... \n"
+#~ "The items can be separated by commas or spaces.\n"
+#~ "\n"
+#~ "Example: alice bob charlie\n"
+#~ msgstr ""
+#~ "ユーザーパーミッションの一覧を入力してください。次のような形式で構成されるユーザー名の一覧です。\n"
+#~ "  [user:]<user name 1>, [user:]<user name 2>,... \n"
+#~ "複数の場合はコンマまたは空白で区切ることができます。\n"
+#~ "\n"
+#~ "例: alice bob charlie\n"
+
+#~ msgid "'%s' is not valid master; use ifname or connection UUID"
+#~ msgstr "'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
+
+#~ msgid "private key password not provided"
+#~ msgstr "プライベートキーのパスワードが入力されていません"
+
+#~ msgid ""
+#~ "Enter path to a private key and the key password (if not set yet):\n"
+#~ "  <file path> [<password>]\n"
+#~ "Example: /home/cimrman/jara-priv-key Dardanely\n"
+#~ msgstr ""
+#~ "プライベートキーへのパスとキーパスワード (まだ設定していない場合) を入力してください:\n"
+#~ "  <file path> [<password>]\n"
+#~ "例: /home/cimrman/jara-priv-key Dardanely\n"
+
+#~ msgid ""
+#~ "Enter bytes as a list of hexadecimal values.\n"
+#~ "Two formats are accepted:\n"
+#~ "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+#~ "(b) space-separated list of bytes written as hexadecimal digits (with optional 0x/0X prefix, and optional leading 0).\n"
+#~ "\n"
+#~ "Examples: ab0455a6ea3a74C2\n"
+#~ "          ab 4 55 0xa6 ea 3a 74 C2\n"
+#~ msgstr ""
+#~ "16 進値の一覧のバイトを入力してください。\n"
+#~ "入力できる形式は 2 種類あります。\n"
+#~ "(a) 16 進の数字から成る列、2 桁で 1 バイト\n"
+#~ "(b) 空白で区切った 16 進の数字の並び (オプションで 0x/0X プレフィックス、および先行の 0 を使用可能)\n"
+#~ "\n"
+#~ "例: ab0455a6ea3a74C2\n"
+#~ "          ab 4 55 0xa6 ea 3a 74 C2\n"
+
+#~ msgid ""
+#~ "Enter a list of bonding options formatted as:\n"
+#~ "  option = <value>, option = <value>,... \n"
+#~ "Valid options are: %s\n"
+#~ "'mode' can be provided as a name or a number:\n"
+#~ "balance-rr    = 0\n"
+#~ "active-backup = 1\n"
+#~ "balance-xor   = 2\n"
+#~ "broadcast     = 3\n"
+#~ "802.3ad       = 4\n"
+#~ "balance-tlb   = 5\n"
+#~ "balance-alb   = 6\n"
+#~ "\n"
+#~ "Example: mode=2,miimon=120\n"
+#~ msgstr ""
+#~ "次のような形式でボンドのオプション一覧を入力してください。\n"
+#~ "  オプション = <value>, オプション = <value>,... \n"
+#~ "有効なオプション: %s\n"
+#~ "'mode' はモード名または数値で指定できます。\n"
+#~ "balance-rr    = 0\n"
+#~ "active-backup = 1\n"
+#~ "balance-xor   = 2\n"
+#~ "broadcast     = 3\n"
+#~ "802.3ad       = 4\n"
+#~ "balance-tlb   = 5\n"
+#~ "balance-alb   = 6\n"
+#~ "\n"
+#~ "例: mode=2,miimon=120\n"
+
+#~ msgid "'%s' is not a valid InfiniBand MAC"
+#~ msgstr "'%s' は有効な InfiniBand MAC ではありません"
+
+#~ msgid "'%s' is not a valid IBoIP P_Key"
+#~ msgstr "'%s' は有効な IBoIP P_Key ではありません"
+
+#~ msgid ""
+#~ "Enter a list of IPv4 addresses of DNS servers.\n"
+#~ "\n"
+#~ "Example: 8.8.8.8, 8.8.4.4\n"
+#~ msgstr ""
+#~ "DNS サーバーの IPv4 アドレス一覧を入力してください。\n"
+#~ "\n"
+#~ "例: 8.8.8.8, 8.8.4.4\n"
+
+#~ msgid "'%s' is not valid (use ip[/prefix] [gateway])"
+#~ msgstr "'%s' は無効です (ip[/prefix] [gateway] を使用してください)"
+
+#~ msgid ""
+#~ "Enter a list of IPv4 addresses formatted as:\n"
+#~ "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#~ "Missing prefix is regarded as prefix of 32.\n"
+#~ "\n"
+#~ "Example: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+#~ msgstr ""
+#~ "次のような形式で IPv4 アドレスの一覧を入力してください。\n"
+#~ "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#~ "プレフィックスがないものはプレフィックス 32 とみなします。\n"
+#~ "\n"
+#~ "例: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+
+#~ msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
+#~ msgstr "'%s' は無効です (ip/[prefix] next-hop [metric] を使用してください)"
+
+#~ msgid ""
+#~ "Enter a list of IPv4 routes formatted as:\n"
+#~ "  ip/[prefix] next-hop [metric],... \n"
+#~ "Missing prefix is regarded as a prefix of 32.\n"
+#~ "Missing metric is regarded as a metric of 0.\n"
+#~ "\n"
+#~ "Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+#~ msgstr ""
+#~ "次のような形式で IPv4 ルートの一覧を入力してください。\n"
+#~ "  ip/[prefix] next-hop [metric],... \n"
+#~ "プレフィックスがないものはプレフィックス 32 とみなします。\n"
+#~ "メトリックがないものはメトリック 0 とみなします。\n"
+#~ "\n"
+#~ "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+
+#~ msgid ""
+#~ "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration method is 'auto' these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' IPv6 configuration methods, as there is no usptream network. In all other IPv6 configuration methods methods, these DNS servers are used as the only DNS servers for this connection.\n"
+#~ "\n"
+#~ "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
+#~ msgstr ""
+#~ "DNS サーバーの IPv6 アドレス一覧を入力してください。IPv6 設定方法が 'auto' の場合は、自動設定で返されるものに追加されます。DNS サーバーは、上流となるネットワークがないため 'shared' または 'link-local' の IPv6 設定方法では使用できません。その他の IPv6 設定方法ではすべて、これらの DNS サーバーはこの接続用の DNS サーバーとしてのみ使用されます。\n"
+#~ "\n"
+#~ "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
+
+#~ msgid ""
+#~ "Enter a list of IPv6 addresses formatted as:\n"
+#~ "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#~ "Missing prefix is regarded as prefix of 128.\n"
+#~ "\n"
+#~ "Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:326b\n"
+#~ msgstr ""
+#~ "次のような形式で IPv6 アドレスの一覧を入力してください。\n"
+#~ "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+#~ "プレフィックスがないものはプレフィックス 128 とみなします。\n"
+#~ "\n"
+#~ "例: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:326b\n"
+
+#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
+#~ msgstr "'%s' は無効です (<dest IP>/prefix <next-hop IP> [metric] を使用してください)"
+
+#~ msgid ""
+#~ "Enter a list of IPv6 routes formatted as:\n"
+#~ "  ip/[prefix] next-hop [metric],... \n"
+#~ "Missing prefix is regarded as a prefix of 128.\n"
+#~ "Missing metric is regarded as a metric of 0.\n"
+#~ "\n"
+#~ "Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
+#~ msgstr ""
+#~ "次のような形式で IPv6 ルートの一覧を入力してください。\n"
+#~ "  ip/[prefix] next-hop [metric],... \n"
+#~ "プレフィックスがないものはプレフィックス 128 とみなします。\n"
+#~ "Missing metric is regarded as a metric of 0.\n"
+#~ "\n"
+#~ "例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
+
+#~ msgid "'%s' is not valid; use 0, 1, or 2"
+#~ msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
+
+#~ msgid "'%s' is not a valid channel; use <1-13>"
+#~ msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
+
+#~ msgid "'%s' is not valid; use [e, o, n]"
+#~ msgstr "'%s' は無効です; [e, o, n] を使用してください"
+
+#~ msgid "no priority to remove"
+#~ msgstr "削除する優先度がありません"
+
+#~ msgid "index '%d' is not in the range of <0-%d>"
+#~ msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
+
+#~ msgid "'%s' is not valid; 3 strings should be provided"
+#~ msgstr "'%s' は無効です; 3 つの文字列を入力してください"
+
+#~ msgid ""
+#~ "Enter a list of three channels (comma or space separated).\n"
+#~ "\n"
+#~ "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
+#~ msgstr ""
+#~ "3 チャンネルの一覧を入力してください (チャンネル同士はコンマまたは空白で区切ります)。\n"
+#~ "\n"
+#~ "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
+
+#~ msgid ""
+#~ "Enter a list of S/390 options formatted as:\n"
+#~ "  option = <value>, option = <value>,... \n"
+#~ "Valid options are: %s\n"
+#~ msgstr ""
+#~ "次のような形式で S/390 のオプション一覧を入力してください。\n"
+#~ "  option = <value>, option = <value>,... \n"
+#~ "有効なオプション: %s\n"
+
+#~ msgid "'%s' is not a valid channel"
+#~ msgstr "'%s' は有効なチャンネルではありません"
+
+#~ msgid "'%ld' is not a valid channel"
+#~ msgstr "'%ld' は有効なチャンネルではありません"
+
+#~ msgid "WEP key is guessed to be of '%s'\n"
+#~ msgstr "WEP キーは '%s' であると仮定しています\n"
+
+#~ msgid "'%s' is not a valid PSK"
+#~ msgstr "'%s' は有効な PSK ではありません"
+
+#~ msgid "don't know how to get the property value"
+#~ msgstr "プロパティ値の取得方法がわかりません"
+
+#~ msgid "the property can't be changed"
+#~ msgstr "このプロパティは変更できません"
+
+#~ msgid "[NM property description]"
+#~ msgstr "[NM プロパティの詳細]"
+
+#~ msgid "[nmcli specific description]"
+#~ msgstr "[nmcli 固有の詳細]"
+
+#~ msgid "Error: value for '%s' argument is required."
+#~ msgstr "エラー: '%s' 引数の値が必要です。"
+
+#~ msgid "Error: Argument '%s' was expected, but '%s' provided."
+#~ msgstr "エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
+
+#~ msgid "Error: Unexpected argument '%s'"
+#~ msgstr "エラー: 予期しない引数 '%s' です"
+
+#~ msgid "'%s' is not valid; use [%s] or [%s]"
+#~ msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
+
+#~ msgid "'%s' is ambiguous (%s x %s)"
+#~ msgstr "'%s' が不明瞭です (%s x %s)"
+
+#~ msgid "missing name, try one of [%s]"
+#~ msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
+
+#~ msgid "property is missing"
+#~ msgstr "プロパティがありません"
+
+#~ msgid "property is empty"
+#~ msgstr "プロパティが空です"
+
+#~ msgid "has to match '%s' property for PKCS#12"
+#~ msgstr "PKCS#12 の '%s' プロパティと一致しなければなりません"
+
+#~ msgid "property is invalid"
+#~ msgstr "プロパティが無効です"
+
+#~ msgid "'%s' is not a valid value for the property"
+#~ msgstr "'%s' は有効なプロパティの値ではありません"
+
+#~ msgid "requires '%s' or '%s' setting"
+#~ msgstr "'%s' または '%s' の設定が必要です"
+
+#~ msgid "invalid option '%s' or its value '%s'"
+#~ msgstr "無効なオプション '%s'、またはその値 '%s' です"
+
+#~ msgid "mandatory option '%s' is missing"
+#~ msgstr "必須オプションの '%s' がありません"
+
+#~ msgid "'%s' is not a valid value for '%s'"
+#~ msgstr "'%s' は有効な '%s' の値ではありません"
+
+#~ msgid "'%s=%s' is incompatible with '%s > 0'"
+#~ msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
+
+#~ msgid "'%s=%s' is not a valid configuration for '%s'"
+#~ msgstr "'%s=%s' は '%s' の有効な設定ではありません"
+
+#~ msgid "'%s' option requires '%s' option to be set"
+#~ msgstr "'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
+
+#~ msgid "'%s' option is empty"
+#~ msgstr "'%s' オプションが空白です"
+
+#~ msgid "'%s' is not a valid IPv4 address for '%s' option"
+#~ msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
+
+#~ msgid "'%d' is not a valid value for the property (should be <= %d)"
+#~ msgstr "'%d' はプロパティの有効な値ではありません (%d 以下となるはずです)"
+
+#~ msgid "value '%d' is out of range <%d-%d>"
+#~ msgstr "値 '%d' は <%d-%d> の範囲外です"
+
+#~ msgid "property is empty'"
+#~ msgstr "プロパティが空です"
+
+#~ msgid "'%s' doesn't match the virtual interface name '%s'"
+#~ msgstr "'%s' は仮想インターフェース名 '%s' と一致しません"
+
+#~ msgid "requires presence of '%s' setting in the connection"
+#~ msgstr "接続には '%s' 設定がなければなりません"
+
+#~ msgid "IPv4 configuration is not allowed for bonding slave"
+#~ msgstr "ボンドスレーブには IPv4 設定は許可されていません"
+
+#~ msgid "IPv6 configuration is not allowed for bonding slave"
+#~ msgstr "ボンドスレーブには IPv6 設定は許可されていません"
+
+#~ msgid "property value '%s' is empty or too long (>64)"
+#~ msgstr "プロパティ値 '%s' が空白、または長過ぎます (>64)"
+
+#~ msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
+#~ msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
+
+#~ msgid "'%s' length is invalid (should be 5 or 6 digits)"
+#~ msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
+
+#~ msgid "not a valid interface name"
+#~ msgstr "無効なインターフェース名です"
+
+#~ msgid "Must specify a P_Key if specifying parent"
+#~ msgstr "親を指定している場合は P_Key を指定する必要があります"
+
+#~ msgid "InfiniBand P_Key connection did not specify parent interface name"
+#~ msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
+
+#~ msgid "this property is not allowed for '%s=%s'"
+#~ msgstr "このプロパティは '%s=%s' には許可されていません"
+
+#~ msgid "%d. IPv4 address is invalid"
+#~ msgstr "%d. IPv4 アドレスは無効です"
+
+#~ msgid "%d. IPv4 address has invalid prefix"
+#~ msgstr "%d. IPv4 に無効なプレフィックスがあります"
+
+#~ msgid "%d. route is invalid"
+#~ msgstr "%d. ルートは無効です"
+
+#~ msgid "%d. route has invalid prefix"
+#~ msgstr "%d. ルートに無効なプレフィックスがあります"
+
+#~ msgid "'%s' not allowed for %s=%s"
+#~ msgstr "'%s' は %s=%s に許可されません"
+
+#~ msgid "SSID length is out of range <1-32> bytes"
+#~ msgstr "SSID の長さは範囲外 <1-32> バイトです"
+
+#~ msgid "'%d' is not a valid channel"
+#~ msgstr "'%d' は無効なチャンネルです"
+
+#~ msgid "'%d' is out of valid range <128-16384>"
+#~ msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
+
+#~ msgid "setting this property requires non-zero '%s' property"
+#~ msgstr "このプロパティを設定するにはゼロ以外の '%s' プロパティが必要です"
+
+#~ msgid "'%s' value doesn't match '%s=%s'"
+#~ msgstr "'%s' の値は '%s=%s' と一致しません"
+
+#~ msgid "'%s' is neither an UUID nor an interface name"
+#~ msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
+
+#~ msgid "flags are invalid"
+#~ msgstr "フラグが無効です"
+
+#~ msgid "'%s' is not a valid ethernet port value"
+#~ msgstr "'%s' は有効な Ethernet ポート値ではありません"
+
+#~ msgid "'%s' is not a valid duplex value"
+#~ msgstr "'%s' は有効な二重値ではありません"
+
+#~ msgid "is not a valid MAC address"
+#~ msgstr "は有効な MAC アドレスではありません"
+
+#~ msgid "'%s' is not a valid MAC address"
+#~ msgstr "'%s' は有効な MAC アドレスではありません"
+
+#~ msgid "invalid '%s' or its value '%s'"
+#~ msgstr "無効な '%s' またはその値 '%s' です"
+
+#~ msgid "'%s' security requires '%s=%s'"
+#~ msgstr "'%s' セキュリティには '%s=%s' が必要です"
+
+#~ msgid "'%s' security requires '%s' setting presence"
+#~ msgstr "'%s' セキュリティには '%s' の設定が必要になります"
+
+#~ msgid "'%d' value is out of range <0-3>"
+#~ msgstr "'%d' の値は <0-3> の範囲外になります"
+
+#~ msgid "'%s' connections require '%s' in this property"
+#~ msgstr "'%s' の接続の場合、このプロパティに '%s' が必要になります"
+
+#~ msgid "'%s' can only be used with '%s=%s' (WEP)"
+#~ msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
+
+#~ msgid "'%s' is not a valid Wi-Fi mode"
+#~ msgstr "'%s' は有効な Wi-Fi モードではありません"
+
+#~ msgid "'%s' is not a valid band"
+#~ msgstr "'%s' は有効なバンドではありません"
+
+#~ msgid "requires setting '%s' property"
+#~ msgstr "'%s' プロパティの設定が必要です"
+
+#~ msgid "Don't become a daemon, and log to stderr"
+#~ msgstr "デーモンにせず、stderr にログ記録する"
+
+#~ msgid "Log domains separated by ',': any combination of [%s]"
+#~ msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
+
+#~ msgid "Config directory location"
+#~ msgstr "設定ディレクトリの場所"
+
+#~ msgid "/path/to/config/dir"
+#~ msgstr "/path/to/config/dir"
+
+#~ msgid "Team connection %d"
+#~ msgstr "チーム接続 %d"
+
+#, fuzzy
+#~| msgid "NetworkManager status"
+#~ msgid "NetworkManager needs to turn off networks"
+#~ msgstr "NetworkManager のステータス"
+
+#~ msgid "Team"
+#~ msgstr "チーム"
+
+#~ msgid "Waits for NetworkManager to finish activating startup network connections."
+#~ msgstr "NetworkManager によりスタートアップネットワーク接続のアクティベートが完了されるのを待機します。"
+
+#~ msgid "SCOPE"
+#~ msgstr "範囲"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "DBUS-サービス"
+
+#~ msgid "system"
+#~ msgstr "システム"
+
+#~ msgid "user"
+#~ msgstr "ユーザー"
+
+#~ msgid "state: %s\n"
+#~ msgstr "状態: %s\n"
+
+#~ msgid "Connection activated\n"
+#~ msgstr "接続はアクティベート済み\n"
+
+#~ msgid "state: %s (%d)\n"
+#~ msgstr "状態: %s (%d)\n"
+
+#~ msgid "Active connection path: %s\n"
+#~ msgstr "アクティブ接続のパス: %s\n"
+
+#~ msgid "IP4-SETTINGS"
+#~ msgstr "IP4-セッティング"
+
+#~ msgid "PREFIX"
+#~ msgstr "接頭辞"
+
+#~ msgid ""
+#~ "Usage: nmcli dev { COMMAND | help }\n"
+#~ "\n"
+#~ "  COMMAND := { status | list | disconnect | wifi }\n"
+#~ "\n"
+#~ "  status\n"
+#~ "  list [iface <iface>]\n"
+#~ "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+#~ "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使用法: nmcli dev { COMMAND | help }\n"
+#~ "\n"
+#~ "  COMMAND := { status | list | disconnect | wifi }\n"
+#~ "\n"
+#~ "  status\n"
+#~ "  list [iface <iface>]\n"
+#~ "  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+#~ "  wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+#~ "\n"
+
+#~ msgid "unknown)"
+#~ msgstr "不明)"
+
+#~ msgid "Device state: %d (%s)\n"
+#~ msgstr "デバイスの状態: %d (%s)\n"
 
+#~ msgid "Auto %s"
+#~ msgstr "自動 %s"
diff --git a/po/or.po b/po/or.po
index 55488371..f108e3e2 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1410,7 +1410,7 @@ msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "ତ୍ରୁଟି:ନୂତନ ସଂଯୋଗକୁ ଯୋଗ କରିବା/ସକ୍ରିୟ କରିବାରେ ବିଫଳ: ଅଜଣା ତ୍ରୁଟି"
 
 #: ../cli/src/devices.c:1613
-#, c-format
+#, fuzzy, c-format
 #| msgid "Error: %s argument is missing."
 msgid "Error: SSID or BSSID are missing."
 msgstr "ତ୍ରୁଟି: %s  SSID କିମ୍ବା BSSID ଅନୁପସ୍ଥିତ ଅଛି।"
diff --git a/po/pl.po b/po/pl.po
index 6e4c76d3..5698f7a0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,27 +4,31 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Wadim Dziedzic <wdziedzic@aviary.pl>, 2007-2008.
+# Artur Flinta <aflinta@at.kernel.pl>, 2007.
+# Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2010.
+# Piotr Drąg <piotrdrag@gmail.com>, 2009-2013.
+# Aviary.pl <gnomepl@aviary.pl>, 2007-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-08 15:25+0000\n"
-"PO-Revision-Date: 2012-06-29 20:19+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-23 18:00+0100\n"
+"PO-Revision-Date: 2013-03-23 18:01+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
 #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
-#: ../cli/src/common.c:63 ../cli/src/connections.c:128
-#: ../cli/src/connections.c:162
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
 msgid "GROUP"
 msgstr "GRUPA"
 
@@ -98,7 +102,7 @@ msgstr "łączenie (uruchamianie drugorzędnych połączeń)"
 msgid "connected"
 msgstr "połączono"
 
-#: ../cli/src/common.c:386 ../cli/src/connections.c:633
+#: ../cli/src/common.c:386 ../cli/src/connections.c:466
 msgid "deactivating"
 msgstr "deaktywowanie"
 
@@ -106,16 +110,16 @@ msgstr "deaktywowanie"
 msgid "connection failed"
 msgstr "połączenie się nie powiodło"
 
-#: ../cli/src/common.c:390 ../cli/src/connections.c:636
-#: ../cli/src/connections.c:659 ../cli/src/connections.c:1349
-#: ../cli/src/devices.c:622 ../cli/src/network-manager.c:123
+#: ../cli/src/common.c:390 ../cli/src/connections.c:471
+#: ../cli/src/connections.c:494 ../cli/src/connections.c:1189
+#: ../cli/src/devices.c:664 ../cli/src/network-manager.c:123
 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
 #: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
 #: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
 #: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
-#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:583
-#: ../cli/src/settings.c:611 ../cli/src/utils.c:531 ../src/main.c:462
-#: ../src/main.c:481
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533
+#: ../src/main.c:429 ../src/main.c:448
 msgid "unknown"
 msgstr "nieznane"
 
@@ -141,7 +145,7 @@ msgstr "Urządzenie nie może zostać odczytane do konfiguracji"
 
 #: ../cli/src/common.c:414
 msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)"
+"IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "Konfiguracja IP nie mogła zostać zastrzeżona (brak dostępnego adresu, czasu "
 "oczekiwania itp.)"
@@ -172,7 +176,7 @@ msgstr "Suplikant 802.1X za długo się uwierzytelniał"
 
 #: ../cli/src/common.c:435
 msgid "PPP service failed to start"
-msgstr "uruchomienie usługi PPP się nie powiodło"
+msgstr "Uruchomienie usługi PPP się nie powiodło"
 
 #: ../cli/src/common.c:438
 msgid "PPP service disconnected"
@@ -184,7 +188,7 @@ msgstr "Usługa PPP się nie powiodła"
 
 #: ../cli/src/common.c:444
 msgid "DHCP client failed to start"
-msgstr "uruchomienie klienta DHCP się nie powiodło"
+msgstr "Uruchomienie klienta DHCP się nie powiodło"
 
 #: ../cli/src/common.c:447
 msgid "DHCP client error"
@@ -331,23 +335,36 @@ msgstr "Zależność połączenia się nie powiodła"
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Problem z mostkiem ethernetowym RFC 2684 na ADSL"
 
-#: ../cli/src/common.c:555 ../cli/src/devices.c:274 ../cli/src/devices.c:290
-#: ../cli/src/devices.c:410 ../cli/src/devices.c:454
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "Usługa ModemManager jest niedostępna"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Nie można odnaleźć sieci Wi-Fi"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "Drugorzędne połączenie połączenia podstawowego się nie powiodło"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:310 ../cli/src/devices.c:328
+#: ../cli/src/devices.c:450 ../cli/src/devices.c:494
 msgid "Unknown"
 msgstr "Nieznane"
 
 #. 0
 #. used only for 'GENERAL' group listing
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:129
-#: ../cli/src/devices.c:105 ../cli/src/devices.c:129 ../cli/src/devices.c:139
-#: ../cli/src/devices.c:149 ../cli/src/devices.c:163 ../cli/src/devices.c:177
-#: ../cli/src/devices.c:199
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:109 ../cli/src/devices.c:134 ../cli/src/devices.c:144
+#: ../cli/src/devices.c:154 ../cli/src/devices.c:164 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:194 ../cli/src/devices.c:216 ../cli/src/devices.c:232
+#: ../cli/src/devices.c:241
 msgid "NAME"
 msgstr "NAZWA"
 
 #. 0
 #. 1
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:130
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
 msgid "UUID"
 msgstr "UUID"
 
@@ -355,29 +372,29 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:163
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:107 ../cli/src/devices.c:202
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:111 ../cli/src/devices.c:219
 msgid "TYPE"
 msgstr "TYP"
 
 #. 2
-#: ../cli/src/connections.c:62
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "OKRES-CZASU"
 
 #. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "RZECZYWISTY-OKRES-CZASU"
 
 #. 4
 #. 13
-#: ../cli/src/connections.c:64 ../cli/src/devices.c:119
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:123
 msgid "AUTOCONNECT"
 msgstr "ŁĄCZENIE-AUTOMATYCZNE"
 
 #. 5
-#: ../cli/src/connections.c:65
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "TYLKO-DO-ODCZYTU"
 
@@ -386,13 +403,13 @@ msgstr "TYLKO-DO-ODCZYTU"
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:66 ../cli/src/connections.c:137
-#: ../cli/src/devices.c:73 ../cli/src/devices.c:189 ../cli/src/devices.c:205
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:206 ../cli/src/devices.c:222
 msgid "DBUS-PATH"
 msgstr "ŚCIEŻKA-DO-DBUS"
 
 #. 2
-#: ../cli/src/connections.c:131
+#: ../cli/src/connections.c:136
 msgid "DEVICES"
 msgstr "URZĄDZENIA"
 
@@ -400,85 +417,85 @@ msgstr "URZĄDZENIA"
 #. 1
 #. 8
 #. 1
-#: ../cli/src/connections.c:132 ../cli/src/devices.c:72
-#: ../cli/src/devices.c:114 ../cli/src/network-manager.c:39
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:118 ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STAN"
 
 #. 4
-#: ../cli/src/connections.c:133
+#: ../cli/src/connections.c:138
 msgid "DEFAULT"
 msgstr "DOMYŚLNE"
 
 #. 5
-#: ../cli/src/connections.c:134
+#: ../cli/src/connections.c:139
 msgid "DEFAULT6"
 msgstr "DOMYŚLNE6"
 
 #. 6
-#: ../cli/src/connections.c:135
+#: ../cli/src/connections.c:140
 msgid "SPEC-OBJECT"
 msgstr "KONKRETNY-OBIEKT"
 
 #. 7
 #. 1
-#: ../cli/src/connections.c:136 ../cli/src/connections.c:150
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
-#: ../cli/src/connections.c:138
+#: ../cli/src/connections.c:143
 msgid "CON-PATH"
 msgstr "ŚCIEŻKA-DO-POŁĄCZENIA"
 
 #. 10
-#: ../cli/src/connections.c:139
+#: ../cli/src/connections.c:144
 msgid "ZONE"
 msgstr "STREFA"
 
 #. 11
-#: ../cli/src/connections.c:140
+#: ../cli/src/connections.c:145
 msgid "MASTER-PATH"
 msgstr "GŁÓWNA-ŚCIEŻKA"
 
-#: ../cli/src/connections.c:148 ../cli/src/devices.c:82
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
 msgid "GENERAL"
 msgstr "OGÓLNE"
 
 #. 0
-#: ../cli/src/connections.c:149
+#: ../cli/src/connections.c:154
 msgid "IP"
 msgstr "IP"
 
 #. 1
-#: ../cli/src/connections.c:164
+#: ../cli/src/connections.c:169
 msgid "USERNAME"
 msgstr "NAZWA-UŻYTKOWNIKA"
 
 #. 2
-#: ../cli/src/connections.c:165
+#: ../cli/src/connections.c:170
 msgid "GATEWAY"
 msgstr "BRAMA"
 
 #. 3
-#: ../cli/src/connections.c:166
+#: ../cli/src/connections.c:171
 msgid "BANNER"
 msgstr "BANER"
 
 #. 4
-#: ../cli/src/connections.c:167
+#: ../cli/src/connections.c:172
 msgid "VPN-STATE"
 msgstr "STAN-VPN"
 
 #. 5
-#: ../cli/src/connections.c:168
+#: ../cli/src/connections.c:173
 msgid "CFG"
 msgstr "KONFIGURACJA"
 
-#: ../cli/src/connections.c:190
+#: ../cli/src/connections.c:195
 #, c-format
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id <id> | uuid <id>]\n"
@@ -489,8 +506,9 @@ msgid ""
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 "  delete id <id> | uuid <id>\n"
+"\n"
 msgstr ""
-"Użycie: nmcli con { POLECENIE | help }\n"
+"Użycie: nmcli connection { POLECENIE | help }\n"
 "  POLECENIE := { list | status | up | down | delete }\n"
 "\n"
 "  list [id <identyfikator> | uuid <identyfikator>]\n"
@@ -501,361 +519,371 @@ msgstr ""
 "<BSSID>] [--nowait] [--timeout <timeout>]\n"
 "  down id <identyfikator> | uuid <identyfikator>\n"
 "  delete id <identyfikator> | uuid <identyfikator>\n"
+"\n"
 
-#: ../cli/src/connections.c:249 ../cli/src/connections.c:609
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:442
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Błąd: \"con list\": %s"
 
-#: ../cli/src/connections.c:251 ../cli/src/connections.c:611
+#: ../cli/src/connections.c:258 ../cli/src/connections.c:444
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Błąd: \"con list\": %s; dozwolone pola: %s"
 
-#: ../cli/src/connections.c:259
+#: ../cli/src/connections.c:266
 msgid "Connection details"
 msgstr "Szczegóły połączenia"
 
-#: ../cli/src/connections.c:484
+#: ../cli/src/connections.c:317
 msgid "never"
 msgstr "nigdy"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
-#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
-#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
-#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
-#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
-#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:267
-#: ../cli/src/settings.c:677 ../cli/src/settings.c:747
-#: ../cli/src/settings.c:867 ../cli/src/settings.c:1149
-#: ../cli/src/settings.c:1150 ../cli/src/settings.c:1152
-#: ../cli/src/settings.c:1154 ../cli/src/settings.c:1155
-#: ../cli/src/settings.c:1283 ../cli/src/settings.c:1284
-#: ../cli/src/settings.c:1285 ../cli/src/settings.c:1286
-#: ../cli/src/settings.c:1361 ../cli/src/settings.c:1362
-#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364
-#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1366
-#: ../cli/src/settings.c:1367 ../cli/src/settings.c:1368
-#: ../cli/src/settings.c:1369 ../cli/src/settings.c:1370
-#: ../cli/src/settings.c:1371 ../cli/src/settings.c:1372
-#: ../cli/src/settings.c:1373 ../cli/src/settings.c:1444
+#: ../cli/src/connections.c:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376
+#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379
+#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382
+#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514
+#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516
+#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595
+#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597
+#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599
+#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601
+#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603
+#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605
+#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688
+#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081
 msgid "yes"
 msgstr "tak"
 
-#: ../cli/src/connections.c:485 ../cli/src/connections.c:486
-#: ../cli/src/connections.c:714 ../cli/src/connections.c:715
-#: ../cli/src/connections.c:717 ../cli/src/devices.c:418
-#: ../cli/src/devices.c:471 ../cli/src/devices.c:587 ../cli/src/devices.c:588
-#: ../cli/src/devices.c:589 ../cli/src/devices.c:621 ../cli/src/devices.c:647
-#: ../cli/src/devices.c:648 ../cli/src/devices.c:649 ../cli/src/devices.c:650
-#: ../cli/src/devices.c:651 ../cli/src/network-manager.c:269
-#: ../cli/src/settings.c:677 ../cli/src/settings.c:679
-#: ../cli/src/settings.c:747 ../cli/src/settings.c:867
-#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1150
-#: ../cli/src/settings.c:1152 ../cli/src/settings.c:1154
-#: ../cli/src/settings.c:1155 ../cli/src/settings.c:1283
-#: ../cli/src/settings.c:1284 ../cli/src/settings.c:1285
-#: ../cli/src/settings.c:1286 ../cli/src/settings.c:1361
-#: ../cli/src/settings.c:1362 ../cli/src/settings.c:1363
-#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365
-#: ../cli/src/settings.c:1366 ../cli/src/settings.c:1367
-#: ../cli/src/settings.c:1368 ../cli/src/settings.c:1369
-#: ../cli/src/settings.c:1370 ../cli/src/settings.c:1371
-#: ../cli/src/settings.c:1372 ../cli/src/settings.c:1373
-#: ../cli/src/settings.c:1444
+#: ../cli/src/connections.c:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:868 ../cli/src/settings.c:941
+#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377
+#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381
+#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513
+#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515
+#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594
+#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596
+#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598
+#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600
+#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602
+#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604
+#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606
+#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044
+#: ../cli/src/settings.c:2081
 msgid "no"
 msgstr "nie"
 
-#: ../cli/src/connections.c:560
+#: ../cli/src/connections.c:393
 msgid "Connection list"
 msgstr "Lista połączeń"
 
-#: ../cli/src/connections.c:573 ../cli/src/connections.c:1110
-#: ../cli/src/connections.c:1646 ../cli/src/connections.c:1661
-#: ../cli/src/connections.c:1670 ../cli/src/connections.c:1680
-#: ../cli/src/connections.c:1692 ../cli/src/connections.c:1800
-#: ../cli/src/connections.c:1902 ../cli/src/devices.c:1041
-#: ../cli/src/devices.c:1051 ../cli/src/devices.c:1169
-#: ../cli/src/devices.c:1177 ../cli/src/devices.c:1541
-#: ../cli/src/devices.c:1548 ../cli/src/devices.c:1562
-#: ../cli/src/devices.c:1569 ../cli/src/devices.c:1586
-#: ../cli/src/devices.c:1597 ../cli/src/devices.c:1818
-#: ../cli/src/devices.c:1825
+#: ../cli/src/connections.c:406 ../cli/src/connections.c:948
+#: ../cli/src/connections.c:1486 ../cli/src/connections.c:1501
+#: ../cli/src/connections.c:1510 ../cli/src/connections.c:1520
+#: ../cli/src/connections.c:1532 ../cli/src/connections.c:1641
+#: ../cli/src/connections.c:1743 ../cli/src/devices.c:1192
+#: ../cli/src/devices.c:1202 ../cli/src/devices.c:1320
+#: ../cli/src/devices.c:1328 ../cli/src/devices.c:1692
+#: ../cli/src/devices.c:1699 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1720 ../cli/src/devices.c:1737
+#: ../cli/src/devices.c:1748 ../cli/src/devices.c:1969
+#: ../cli/src/devices.c:1976
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Błąd: brak parametru %s."
 
-#: ../cli/src/connections.c:586
+#: ../cli/src/connections.c:419
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Błąd: %s - nie ma takiego połączenia."
 
-#: ../cli/src/connections.c:592 ../cli/src/connections.c:1705
-#: ../cli/src/connections.c:1817 ../cli/src/connections.c:1909
-#: ../cli/src/devices.c:825 ../cli/src/devices.c:905 ../cli/src/devices.c:1065
-#: ../cli/src/devices.c:1183 ../cli/src/devices.c:1610
-#: ../cli/src/devices.c:1831
+#: ../cli/src/connections.c:425 ../cli/src/connections.c:1545
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1750
+#: ../cli/src/devices.c:976 ../cli/src/devices.c:1056
+#: ../cli/src/devices.c:1216 ../cli/src/devices.c:1334
+#: ../cli/src/devices.c:1761 ../cli/src/devices.c:1982
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nieznany parametr: %s\n"
 
-#: ../cli/src/connections.c:601
+#: ../cli/src/connections.c:434
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Błąd: nie podano prawidłowego parametru."
 
-#: ../cli/src/connections.c:616 ../cli/src/connections.c:2002
-#: ../cli/src/devices.c:2039 ../cli/src/network-manager.c:596
+#: ../cli/src/connections.c:449 ../cli/src/connections.c:1846
+#: ../cli/src/devices.c:2193 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
 msgstr "Błąd: %s."
 
-#: ../cli/src/connections.c:629
+#: ../cli/src/connections.c:462
 msgid "activating"
 msgstr "aktywowanie"
 
-#: ../cli/src/connections.c:631
+#: ../cli/src/connections.c:464
 msgid "activated"
 msgstr "aktywowano"
 
-#: ../cli/src/connections.c:645
+#: ../cli/src/connections.c:468
+msgid "deactivated"
+msgstr "deaktywowano"
+
+#: ../cli/src/connections.c:480
 msgid "VPN connecting (prepare)"
 msgstr "Łączenie z VPN (przygotowanie)"
 
-#: ../cli/src/connections.c:647
+#: ../cli/src/connections.c:482
 msgid "VPN connecting (need authentication)"
 msgstr "Łączenie z VPN (wymaga uwierzytelnienia)"
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:484
 msgid "VPN connecting"
 msgstr "Łączenie z VPN"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:486
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)"
 
-#: ../cli/src/connections.c:653
+#: ../cli/src/connections.c:488
 msgid "VPN connected"
 msgstr "Połączono z VPN"
 
-#: ../cli/src/connections.c:655
+#: ../cli/src/connections.c:490
 msgid "VPN connection failed"
 msgstr "Połączenie z VPN się nie powiodło"
 
-#: ../cli/src/connections.c:657
+#: ../cli/src/connections.c:492
 msgid "VPN disconnected"
 msgstr "Rozłączono z VPN"
 
-#: ../cli/src/connections.c:710 ../cli/src/connections.c:720
+#: ../cli/src/connections.c:548 ../cli/src/connections.c:558
 msgid "N/A"
 msgstr "Nie dotyczy"
 
-#: ../cli/src/connections.c:914 ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:752 ../cli/src/connections.c:976
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "Błąd: \"con status\": %s"
 
-#: ../cli/src/connections.c:916 ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:754 ../cli/src/connections.c:978
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "Błąd: \"con status\": %s; dozwolone pola: %s"
 
-#: ../cli/src/connections.c:924
+#: ../cli/src/connections.c:762
 msgid "Active connection details"
 msgstr "Szczegóły aktywnego połączenia"
 
-#: ../cli/src/connections.c:1060 ../cli/src/connections.c:1720
-#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1923
-#: ../cli/src/devices.c:852 ../cli/src/devices.c:914 ../cli/src/devices.c:1080
-#: ../cli/src/devices.c:1213 ../cli/src/devices.c:1632
-#: ../cli/src/devices.c:1860 ../cli/src/network-manager.c:311
+#: ../cli/src/connections.c:898 ../cli/src/connections.c:1560
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1764
+#: ../cli/src/devices.c:1003 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1231 ../cli/src/devices.c:1364
+#: ../cli/src/devices.c:1783 ../cli/src/devices.c:2011
+#: ../cli/src/network-manager.c:311
 #, c-format
 msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr ""
 "Błąd: nie można ustalić, czy usługa NetworkManager jest uruchomiona: %s."
 
-#: ../cli/src/connections.c:1064 ../cli/src/connections.c:1724
-#: ../cli/src/connections.c:1836 ../cli/src/connections.c:1927
-#: ../cli/src/devices.c:856 ../cli/src/devices.c:918 ../cli/src/devices.c:1084
-#: ../cli/src/devices.c:1217 ../cli/src/devices.c:1636
-#: ../cli/src/devices.c:1864 ../cli/src/network-manager.c:315
+#: ../cli/src/connections.c:902 ../cli/src/connections.c:1564
+#: ../cli/src/connections.c:1677 ../cli/src/connections.c:1768
+#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1069
+#: ../cli/src/devices.c:1235 ../cli/src/devices.c:1368
+#: ../cli/src/devices.c:1787 ../cli/src/devices.c:2015
+#: ../cli/src/network-manager.c:315
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Błąd: usługa NetworkManager nie jest uruchomiona."
 
-#: ../cli/src/connections.c:1096
+#: ../cli/src/connections.c:934
 msgid "Active connections"
 msgstr "Aktywne połączenia"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:959
 #, c-format
 msgid "Error: '%s' is not an active connection."
 msgstr "Błąd: \"%s\" nie jest aktywnym połączeniem."
 
-#: ../cli/src/connections.c:1126
+#: ../cli/src/connections.c:964
 #, c-format
 msgid "Error: unknown parameter: %s"
 msgstr "Błąd nieznany parametr: %s"
 
-#: ../cli/src/connections.c:1233
+#: ../cli/src/connections.c:1071
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "brak aktywnych połączeń na urządzeniu \"%s\""
 
-#: ../cli/src/connections.c:1241
-#, c-format
+#: ../cli/src/connections.c:1079
 msgid "no active connection or device"
 msgstr "brak aktywnych połączeń na urządzeń"
 
-#: ../cli/src/connections.c:1312
+#: ../cli/src/connections.c:1150
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "urządzenie \"%s\" nie jest zgodne z połączeniem \"%s\""
 
-#: ../cli/src/connections.c:1314
+#: ../cli/src/connections.c:1153
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nie odnaleziono urządzenia dla połączenia \"%s\""
 
-#: ../cli/src/connections.c:1325
+#: ../cli/src/connections.c:1165
 msgid "unknown reason"
 msgstr "nieznany powód"
 
-#: ../cli/src/connections.c:1327
+#: ../cli/src/connections.c:1167
 msgid "none"
 msgstr "brak"
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1169
 msgid "the user was disconnected"
 msgstr "użytkownik został rozłączony"
 
-#: ../cli/src/connections.c:1331
+#: ../cli/src/connections.c:1171
 msgid "the base network connection was interrupted"
 msgstr "podstawowe połączenie sieciowe zostało przerwane"
 
-#: ../cli/src/connections.c:1333
+#: ../cli/src/connections.c:1173
 msgid "the VPN service stopped unexpectedly"
 msgstr "usługa VPN została nieoczekiwanie zatrzymana"
 
-#: ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1175
 msgid "the VPN service returned invalid configuration"
 msgstr "usługa VPN zwróciła nieprawidłową konfigurację"
 
-#: ../cli/src/connections.c:1337
+#: ../cli/src/connections.c:1177
 msgid "the connection attempt timed out"
 msgstr "próba połączenia przekroczyła czas oczekiwania"
 
-#: ../cli/src/connections.c:1339
+#: ../cli/src/connections.c:1179
 msgid "the VPN service did not start in time"
 msgstr "usługa VPN nie została uruchomiona w czasie"
 
-#: ../cli/src/connections.c:1341
+#: ../cli/src/connections.c:1181
 msgid "the VPN service failed to start"
 msgstr "uruchomienie usługi VPN się nie powiodło"
 
-#: ../cli/src/connections.c:1343
+#: ../cli/src/connections.c:1183
 msgid "no valid VPN secrets"
 msgstr "brak prawidłowych haseł VPN"
 
-#: ../cli/src/connections.c:1345
+#: ../cli/src/connections.c:1185
 msgid "invalid VPN secrets"
 msgstr "nieprawidłowe hasła VPN"
 
-#: ../cli/src/connections.c:1347
+#: ../cli/src/connections.c:1187
 msgid "the connection was removed"
 msgstr "połączenie zostało usunięte"
 
-#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1569
+#: ../cli/src/connections.c:1204 ../cli/src/connections.c:1409
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 "Połączenie zostało pomyślnie aktywowane (ścieżka aktywacji D-Bus: %s)\n"
 
 #. Active connection failed and dissapeared, quit.
-#: ../cli/src/connections.c:1369 ../cli/src/connections.c:1470
+#: ../cli/src/connections.c:1209 ../cli/src/connections.c:1310
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Błąd: aktywacja połączenia się nie powiodła."
 
-#: ../cli/src/connections.c:1394
+#: ../cli/src/connections.c:1234
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 "Połączenie VPN zostało pomyślnie aktywowane (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1242
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s."
 
-#: ../cli/src/connections.c:1499 ../cli/src/devices.c:974
+#: ../cli/src/connections.c:1339 ../cli/src/devices.c:1125
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Błąd: przekroczono czas oczekiwania o %d sekund."
 
-#: ../cli/src/connections.c:1560
+#: ../cli/src/connections.c:1400
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../cli/src/connections.c:1654 ../cli/src/connections.c:1808
-#: ../cli/src/connections.c:1936
+#: ../cli/src/connections.c:1494 ../cli/src/connections.c:1649
+#: ../cli/src/connections.c:1777
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Błąd: nieznane połączenie: %s."
 
-#: ../cli/src/connections.c:1700 ../cli/src/devices.c:1059
-#: ../cli/src/devices.c:1605
+#: ../cli/src/connections.c:1540 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1756
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Błąd: wartość czasu oczekiwania \"%s\" jest nieprawidłowa."
 
-#: ../cli/src/connections.c:1713 ../cli/src/connections.c:1825
-#: ../cli/src/connections.c:1916
+#: ../cli/src/connections.c:1553 ../cli/src/connections.c:1666
+#: ../cli/src/connections.c:1757
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Błąd: należy podać identyfikator lub UUID."
 
-#: ../cli/src/connections.c:1745
+#: ../cli/src/connections.c:1586
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "Błąd: nie odnaleziono odpowiedniego urządzenia: %s"
+msgstr "Błąd: nie odnaleziono odpowiedniego urządzenia: %s."
 
-#: ../cli/src/connections.c:1747
+#: ../cli/src/connections.c:1588
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Błąd: nie odnaleziono odpowiedniego urządzenia."
 
-#: ../cli/src/connections.c:1861
+#: ../cli/src/connections.c:1702
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Ostrzeżenie: połączenie nie jest aktywne\n"
 
-#: ../cli/src/connections.c:1875
+#: ../cli/src/connections.c:1716
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Błąd: usunięcie połączenia się nie powiodło: %s"
 
-#: ../cli/src/connections.c:1993
+#: ../cli/src/connections.c:1837
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Błąd: polecenie \"con\" \"%s\" jest nieprawidłowe."
 
-#: ../cli/src/connections.c:2061
+#: ../cli/src/connections.c:1905
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Błąd: nie można połączyć się z D-Bus."
 
-#: ../cli/src/connections.c:2069
+#: ../cli/src/connections.c:1913
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Błąd: nie można uzyskać ustawień systemu."
 
-#: ../cli/src/connections.c:2079
+#: ../cli/src/connections.c:1923
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -864,243 +892,284 @@ msgstr ""
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:70 ../cli/src/devices.c:106 ../cli/src/devices.c:187
-#: ../cli/src/devices.c:203
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:110 ../cli/src/devices.c:204
+#: ../cli/src/devices.c:220
 msgid "DEVICE"
 msgstr "URZĄDZENIE"
 
 #. 0
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "MOŻLIWOŚCI"
 
 #. 1
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "WŁAŚCIWOŚCI-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:85
+#. 5
+#: ../cli/src/devices.c:86 ../cli/src/devices.c:170
 msgid "AP"
 msgstr "PUNKT-DOSTĘPOWY"
 
 #. 3
-#: ../cli/src/devices.c:86
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "WŁAŚCIWOŚCI-POŁĄCZENIA-PRZEWODOWEGO"
 
 #. 4
-#: ../cli/src/devices.c:87
+#: ../cli/src/devices.c:88
 msgid "WIMAX-PROPERTIES"
 msgstr "WŁAŚCIWOŚCI-WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:88 ../cli/src/devices.c:200
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:217
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:90
 msgid "IP4"
 msgstr "IP4"
 
 #. 7
-#: ../cli/src/devices.c:90
+#: ../cli/src/devices.c:91
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 8
-#: ../cli/src/devices.c:91
+#: ../cli/src/devices.c:92
 msgid "IP6"
 msgstr "IP6"
 
 #. 9
-#: ../cli/src/devices.c:92
+#: ../cli/src/devices.c:93
 msgid "DHCP6"
 msgstr "DHCP6"
 
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "WIĄZANE"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
+
+#. 12
+#: ../cli/src/devices.c:96
+msgid "CONNECTIONS"
+msgstr "POŁĄCZENIA"
+
 #. 2
-#: ../cli/src/devices.c:108
+#: ../cli/src/devices.c:112
 msgid "VENDOR"
 msgstr "PRODUCENT"
 
 #. 3
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:113
 msgid "PRODUCT"
 msgstr "PRODUKT"
 
 #. 4
-#: ../cli/src/devices.c:110
+#: ../cli/src/devices.c:114
 msgid "DRIVER"
 msgstr "STEROWNIK"
 
 #. 5
-#: ../cli/src/devices.c:111
+#: ../cli/src/devices.c:115
 msgid "DRIVER-VERSION"
 msgstr "WERSJA-STEROWNIKA"
 
 #. 6
-#: ../cli/src/devices.c:112
+#: ../cli/src/devices.c:116
 msgid "FIRMWARE-VERSION"
 msgstr "WERSJA-OPROGRAMOWANIA-SPRZĘTOWEGO"
 
 #. 7
-#: ../cli/src/devices.c:113
+#: ../cli/src/devices.c:117
 msgid "HWADDR"
 msgstr "ADRES-SPRZĘTOWY"
 
 #. 9
-#: ../cli/src/devices.c:115
+#: ../cli/src/devices.c:119
 msgid "REASON"
 msgstr "PRZYCZYNA"
 
 #. 10
-#: ../cli/src/devices.c:116
+#: ../cli/src/devices.c:120
 msgid "UDI"
 msgstr "UDI"
 
 #. 11
-#: ../cli/src/devices.c:117
+#: ../cli/src/devices.c:121
 msgid "IP-IFACE"
 msgstr "INTERFEJS-IP"
 
 #. 12
-#: ../cli/src/devices.c:118
+#: ../cli/src/devices.c:122
 msgid "NM-MANAGED"
 msgstr "ZARZĄDZANE-PRZEZ-NM"
 
 #. 14
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:124
 msgid "FIRMWARE-MISSING"
 msgstr "BRAK-OPROGRAMOWANIA-SPRZĘTOWEGO"
 
 #. 15
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:125
 msgid "CONNECTION"
 msgstr "POŁĄCZENIE"
 
 #. 0
-#: ../cli/src/devices.c:130
+#: ../cli/src/devices.c:135
+msgid "AVAILABLE-CONNECTION-PATHS"
+msgstr "DOSTĘPNE-ŚCIEŻKI-POŁĄCZEŃ"
+
+#. 1
+#: ../cli/src/devices.c:136
+msgid "AVAILABLE-CONNECTIONS"
+msgstr "DOSTĘPNE-POŁĄCZENIA"
+
+#. 0
+#: ../cli/src/devices.c:145
 msgid "CARRIER-DETECT"
 msgstr "WYKRYWANIE-OPERATORA"
 
 #. 1
-#: ../cli/src/devices.c:131
+#: ../cli/src/devices.c:146
 msgid "SPEED"
 msgstr "PRĘDKOŚĆ"
 
 #. 0
-#: ../cli/src/devices.c:140
+#: ../cli/src/devices.c:155
 msgid "CARRIER"
 msgstr "OPERATOR"
 
 #. 0
-#: ../cli/src/devices.c:150
+#: ../cli/src/devices.c:165
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:166
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:167
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:168
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:169
 msgid "CCMP"
 msgstr "CCMP"
 
+#. 6
+#: ../cli/src/devices.c:171
+msgid "ADHOC"
+msgstr "ADHOC"
+
 #. 0
-#: ../cli/src/devices.c:164
+#: ../cli/src/devices.c:181
 msgid "CTR-FREQ"
 msgstr "CZĘSTOTLIWOŚĆ-CTR"
 
 #. 1
-#: ../cli/src/devices.c:165
+#: ../cli/src/devices.c:182
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:166
+#: ../cli/src/devices.c:183
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:167
+#: ../cli/src/devices.c:184
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:168
+#: ../cli/src/devices.c:185
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:178
+#: ../cli/src/devices.c:195
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:179
+#: ../cli/src/devices.c:196
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:180
+#: ../cli/src/devices.c:197
 msgid "MODE"
 msgstr "TRYB"
 
 #. 3
-#: ../cli/src/devices.c:181
+#: ../cli/src/devices.c:198
 msgid "FREQ"
 msgstr "CZĘSTOTLIWOŚĆ"
 
 #. 4
-#: ../cli/src/devices.c:182
+#: ../cli/src/devices.c:199
 msgid "RATE"
 msgstr "OCENA"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:183 ../cli/src/devices.c:201
+#: ../cli/src/devices.c:200 ../cli/src/devices.c:218
 msgid "SIGNAL"
 msgstr "SYGNAŁ"
 
 #. 6
-#: ../cli/src/devices.c:184
+#: ../cli/src/devices.c:201
 msgid "SECURITY"
 msgstr "ZABEZPIECZENIA"
 
 #. 7
-#: ../cli/src/devices.c:185
+#: ../cli/src/devices.c:202
 msgid "WPA-FLAGS"
 msgstr "FLAGI-WPA"
 
 #. 8
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:203
 msgid "RSN-FLAGS"
 msgstr "FLAGI-RSN"
 
 #. 10
 #. 4
-#: ../cli/src/devices.c:188 ../cli/src/devices.c:204
+#: ../cli/src/devices.c:205 ../cli/src/devices.c:221
 msgid "ACTIVE"
 msgstr "AKTYWNOŚĆ"
 
-#: ../cli/src/devices.c:223
+#. 0
+#: ../cli/src/devices.c:233
+msgid "SLAVES"
+msgstr "PODRZĘDNE"
+
+#. 0
+#: ../cli/src/devices.c:242
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:258
 #, c-format
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { COMMAND | help }\n"
 "\n"
 "  COMMAND := { status | list | disconnect | wifi | wimax }\n"
 "\n"
@@ -1116,7 +1185,7 @@ msgid ""
 "  wimax [list [iface <iface>] [nsp <name>]]\n"
 "\n"
 msgstr ""
-"Użycie: nmcli dev { POLECENIE | help }\n"
+"Użycie: nmcli device { POLECENIE | help }\n"
 "\n"
 "  POLECENIE := { status | list | disconnect | wifi | wimax }\n"
 "\n"
@@ -1130,200 +1199,201 @@ msgstr ""
 "<interfejs>] [bssid <BSSID>] [name <nazwa>]\n"
 "               [--private] [--nowait] [--timeout <czas>]\n"
 "  wimax [list [iface <interfejs>] [nsp <nazwa>]]\n"
+"\n"
 
-#: ../cli/src/devices.c:323
+#: ../cli/src/devices.c:361
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../cli/src/devices.c:379
+#: ../cli/src/devices.c:417
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:418
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:389
+#: ../cli/src/devices.c:427
 msgid "Encrypted: "
 msgstr "Zaszyfrowane: "
 
-#: ../cli/src/devices.c:394
+#: ../cli/src/devices.c:432
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:396
+#: ../cli/src/devices.c:434
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:398
+#: ../cli/src/devices.c:436
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:401
+#: ../cli/src/devices.c:439
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:448
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
-#: ../cli/src/devices.c:410
+#: ../cli/src/devices.c:449
 msgid "Infrastructure"
 msgstr "Infrastruktura"
 
-#: ../cli/src/devices.c:445
+#: ../cli/src/devices.c:485
 msgid "Home"
 msgstr "Dom"
 
-#: ../cli/src/devices.c:448
+#: ../cli/src/devices.c:488
 msgid "Partner"
 msgstr "Partner"
 
-#: ../cli/src/devices.c:451
+#: ../cli/src/devices.c:491
 msgid "Roaming"
 msgstr "Roaming"
 
-#: ../cli/src/devices.c:523
+#: ../cli/src/devices.c:563
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Błąd: \"dev list\": %s"
 
-#: ../cli/src/devices.c:525
+#: ../cli/src/devices.c:565
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Błąd: \"dev list\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:534
+#: ../cli/src/devices.c:574
 msgid "Device details"
 msgstr "Informacje o urządzeniu"
 
-#: ../cli/src/devices.c:579 ../cli/src/devices.c:582 ../cli/src/devices.c:1000
-#: ../cli/src/utils.c:477
+#: ../cli/src/devices.c:621 ../cli/src/devices.c:624 ../cli/src/devices.c:1151
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(nieznane)"
 
-#: ../cli/src/devices.c:591
+#: ../cli/src/devices.c:633
 msgid "not connected"
 msgstr "niepołączono"
 
-#: ../cli/src/devices.c:618
+#: ../cli/src/devices.c:660
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:736
 msgid "on"
 msgstr "włączone"
 
-#: ../cli/src/devices.c:691
+#: ../cli/src/devices.c:736
 msgid "off"
 msgstr "wyłączone"
 
-#: ../cli/src/devices.c:842
+#: ../cli/src/devices.c:993
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Błąd: \"dev status\": %s"
 
-#: ../cli/src/devices.c:844
+#: ../cli/src/devices.c:995
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Błąd: \"dev status\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:867
+#: ../cli/src/devices.c:1018
 msgid "Status of devices"
 msgstr "Stan urządzenia"
 
-#: ../cli/src/devices.c:898
+#: ../cli/src/devices.c:1049
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Błąd: brak parametru \"%s\"."
 
-#: ../cli/src/devices.c:939 ../cli/src/devices.c:1104
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1892
+#: ../cli/src/devices.c:1090 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1396 ../cli/src/devices.c:2043
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Błąd: nie odnaleziono urządzenia \"%s\"."
 
-#: ../cli/src/devices.c:962
+#: ../cli/src/devices.c:1113
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Powodzenie: urządzenie \"%s\" zostało rozłączone."
 
-#: ../cli/src/devices.c:997
+#: ../cli/src/devices.c:1148
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Błąd: rozłączenie urządzenia \"%s\" (%s) się nie powiodło: %s"
 
-#: ../cli/src/devices.c:1010
+#: ../cli/src/devices.c:1161
 #, c-format
 msgid "Device '%s' has been disconnected.\n"
 msgstr "Urządzenie \"%s\" zostało rozłączone.\n"
 
-#: ../cli/src/devices.c:1073
+#: ../cli/src/devices.c:1224
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Błąd: należy podać interfejs."
 
-#: ../cli/src/devices.c:1203
+#: ../cli/src/devices.c:1354
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Błąd: \"dev wifi\": %s"
 
-#: ../cli/src/devices.c:1205
+#: ../cli/src/devices.c:1356
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Błąd: \"dev wifi\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:1228
+#: ../cli/src/devices.c:1379
 msgid "WiFi scan list"
 msgstr "Lista skanowania sieci WiFi"
 
-#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1319
+#: ../cli/src/devices.c:1416 ../cli/src/devices.c:1470
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z BSSID \"%s\"."
 
-#: ../cli/src/devices.c:1282
+#: ../cli/src/devices.c:1433
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Błąd: urządzenie \"%s\" nie jest urządzeniem WiFi."
 
-#: ../cli/src/devices.c:1350 ../cli/src/devices.c:1396
+#: ../cli/src/devices.c:1501 ../cli/src/devices.c:1547
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "Utworzono i aktywowano połączenie o UUID \"%s\" na urządzeniu \"%s\"\n"
 
-#: ../cli/src/devices.c:1355
+#: ../cli/src/devices.c:1506
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s."
 msgstr "Błąd: aktywacja połączenia się nie powiodła: (%d) %s."
 
-#: ../cli/src/devices.c:1380
+#: ../cli/src/devices.c:1531
 #, c-format
 msgid "Error: Failed to add/activate new connection: (%d) %s"
 msgstr "Błąd: dodanie/aktywacja nowego połączenia się nie powiodła: (%d) %s"
 
-#: ../cli/src/devices.c:1388
+#: ../cli/src/devices.c:1539
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr ""
 "Błąd: dodanie/aktywacja nowego połączenia się nie powiodła: nieznany błąd"
 
-#: ../cli/src/devices.c:1532
+#: ../cli/src/devices.c:1683
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Błąd: brak SSID lub BSSID."
 
-#: ../cli/src/devices.c:1555
+#: ../cli/src/devices.c:1706
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Błąd: wartość parametru BSSID \"%s\" nie jest prawidłowym BSSID."
 
-#: ../cli/src/devices.c:1579
+#: ../cli/src/devices.c:1730
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -1331,76 +1401,76 @@ msgstr ""
 "Błąd: wartość \"%s\" parametru wep-key-type jest nieprawidłowa, należy użyć "
 "\"key\" lub \"phrase\"."
 
-#: ../cli/src/devices.c:1619
+#: ../cli/src/devices.c:1770
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Błąd: BSSID do połączenia (%s) różni się od parametru BSSID (%s)."
 
-#: ../cli/src/devices.c:1625
+#: ../cli/src/devices.c:1776
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Błąd: parametr \"%s\" nie wynosi SSID ani BSSID."
 
-#: ../cli/src/devices.c:1654
+#: ../cli/src/devices.c:1805
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Błąd: urządzenie \"%s\" nie jest urządzeniem WiFi."
 
-#: ../cli/src/devices.c:1656
+#: ../cli/src/devices.c:1807
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Błąd: nie odnaleziono urządzenia WiFi."
 
-#: ../cli/src/devices.c:1674
+#: ../cli/src/devices.c:1825
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Błąd: nie odnaleziono sieci z SSID \"%s\"."
 
-#: ../cli/src/devices.c:1676
+#: ../cli/src/devices.c:1827
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z BSSID \"%s\"."
 
-#: ../cli/src/devices.c:1774
+#: ../cli/src/devices.c:1925
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Błąd: polecenie \"dev wifi\" \"%s\" jest nieprawidłowe."
 
-#: ../cli/src/devices.c:1850
+#: ../cli/src/devices.c:2001
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Błąd: \"dev wimax\": %s"
 
-#: ../cli/src/devices.c:1852
+#: ../cli/src/devices.c:2003
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Błąd: \"dev wimax\": %s; dozwolone pola: %s"
 
-#: ../cli/src/devices.c:1875
+#: ../cli/src/devices.c:2026
 msgid "WiMAX NSP list"
 msgstr "Lista NSP sieci WiMAX"
 
-#: ../cli/src/devices.c:1912
+#: ../cli/src/devices.c:2063
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Błąd: nie odnaleziono NSP o nazwie \"%s\"."
 
-#: ../cli/src/devices.c:1923
+#: ../cli/src/devices.c:2074
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Błąd: urządzenie \"%s\" nie jest urządzeniem WiMAX."
 
-#: ../cli/src/devices.c:1954
+#: ../cli/src/devices.c:2105
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Błąd: nie odnaleziono punktu dostępowego z NSP \"%s\"."
 
-#: ../cli/src/devices.c:1981
+#: ../cli/src/devices.c:2132
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Błąd: polecenie \"dev wimax\" \"%s\" jest nieprawidłowe."
 
-#: ../cli/src/devices.c:2031
+#: ../cli/src/devices.c:2185
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Błąd: polecenie \"dev\" \"%s\" jest nieprawidłowe."
@@ -1491,6 +1561,7 @@ msgstr ""
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
 "  wimax [on|off]\n"
+"\n"
 
 #: ../cli/src/network-manager.c:108
 msgid "asleep"
@@ -1572,7 +1643,7 @@ msgstr "Błąd: \"nm permissions\": %s; dozwolone pola: %s"
 msgid "NetworkManager permissions"
 msgstr "Uprawnienia usługi NetworkManager"
 
-#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Błąd: nie można połączyć się z magistralą systemową: %s"
@@ -1592,8 +1663,8 @@ msgstr "Błąd w poleceniu sleep: %s"
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
 msgstr ""
-"Błąd: wartość \"%s\" opcji \"--fields\" jest nieprawidłowa; dozwolone pola: %"
-"s."
+"Błąd: wartość \"%s\" opcji \"--fields\" jest nieprawidłowa; dozwolone pola: "
+"%s"
 
 #: ../cli/src/network-manager.c:424
 msgid "Networking enabled"
@@ -1645,12 +1716,12 @@ msgstr "WiMAX jest włączone"
 msgid "Error: invalid 'wimax' parameter: '%s'."
 msgstr "Błąd: nieprawidłowy parametr \"wimax\": \"%s\"."
 
-#: ../cli/src/network-manager.c:585
+#: ../cli/src/network-manager.c:588
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
 msgstr "Błąd: parametr \"nm\" \"%s\" jest nieprawidłowy."
 
-#: ../cli/src/nmcli.c:64
+#: ../cli/src/nmcli.c:76
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -1668,9 +1739,9 @@ msgid ""
 "  -h[elp]                                    print this help\n"
 "\n"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
 "Użycie: %s [OPCJE] OBIEKT { POLECENIE | help }\n"
@@ -1688,218 +1759,248 @@ msgstr ""
 "  -h[elp]                                    wyświetla tę opcję\n"
 "\n"
 "OBIEKT\n"
-"  nm          stan usługi NetworkManager\n"
-"  con         połączenia usługi NetworkManager\n"
-"  dev         urządzenia zarządzane przez usługę NetworkManager\n"
+"  nm              stan usługi NetworkManager\n"
+"  c[onnection]    połączenia usługi NetworkManager\n"
+"  d[evice]        urządzenia zarządzane przez usługę NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:109
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr ""
 "Błąd: obiekt \"%s\" jest nieznany, można spróbować polecenie \"nmcli help\"."
 
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Błąd: opcja \"--terse\" został podana po raz drugi."
 
-#: ../cli/src/nmcli.c:144
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr ""
 "Błąd: opcja \"--terse\" jest wzajemnie wykluczająca z opcją \"--pretty\"."
 
-#: ../cli/src/nmcli.c:152
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Błąd: opcja \"--pretty\" został podana po raz drugi."
 
-#: ../cli/src/nmcli.c:157
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr ""
 "Błąd: opcja \"--pretty\" jest wzajemnie wykluczająca z opcją \"--terse\"."
 
-#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Błąd: brak parametru dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Błąd: \"%s\" nie jest prawidłowym parametrem dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:199
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Błąd: brak pól dla opcji \"%s\"."
 
-#: ../cli/src/nmcli.c:207
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "narzędzie nmcli, wersja %s\n"
 
-#: ../cli/src/nmcli.c:213
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
 "Błąd: opcja \"%s\" jest nieznana. Można spróbować polecenie \"nmcli help\"."
 
-#: ../cli/src/nmcli.c:232
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Przechwycono sygnał %d, wyłączanie..."
 
-#: ../cli/src/nmcli.c:257
+#: ../cli/src/nmcli.c:272
 msgid "Error: Could not create NMClient object."
 msgstr "Błąd: nie można utworzyć obiektu NMClient."
 
-#: ../cli/src/nmcli.c:273
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ../cli/src/settings.c:517
+#: ../cli/src/settings.c:595
 #, c-format
 msgid "%d (hex-ascii-key)"
-msgstr "%d (klucz-szesnastkowy-ascii))"
+msgstr "%d (klucz-szesnastkowy-ascii)"
 
-#: ../cli/src/settings.c:519
+#: ../cli/src/settings.c:597
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bitowe hasło)"
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:600 ../cli/src/settings.c:728
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (nieznane)"
 
-#: ../cli/src/settings.c:548
+#: ../cli/src/settings.c:626
 msgid "0 (unknown)"
 msgstr "0 (nieznane)"
 
-#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:632
 msgid "any, "
 msgstr "dowolne, "
 
-#: ../cli/src/settings.c:556
+#: ../cli/src/settings.c:634
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:558
+#: ../cli/src/settings.c:636
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:560
+#: ../cli/src/settings.c:638
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:562
+#: ../cli/src/settings.c:640
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:564
+#: ../cli/src/settings.c:642
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:566
+#: ../cli/src/settings.c:644
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:568
+#: ../cli/src/settings.c:646
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:570
+#: ../cli/src/settings.c:648
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:572
+#: ../cli/src/settings.c:650
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:574
+#: ../cli/src/settings.c:652
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:576
+#: ../cli/src/settings.c:654
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:578
+#: ../cli/src/settings.c:656
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:580
+#: ../cli/src/settings.c:658
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:598
+#: ../cli/src/settings.c:676
 msgid "0 (NONE)"
 msgstr "0 (BRAK)"
 
-#: ../cli/src/settings.c:604
+#: ../cli/src/settings.c:682
 msgid "REORDER_HEADERS, "
 msgstr "ZMIANA_KOLEJNOŚCI_NAGŁÓWKÓW, "
 
-#: ../cli/src/settings.c:606
+#: ../cli/src/settings.c:684
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:608
+#: ../cli/src/settings.c:686
 msgid "LOOSE_BINDING, "
 msgstr "LUŹNE_DOWIĄZANIE, "
 
-#: ../cli/src/settings.c:751 ../cli/src/settings.c:947
-#: ../cli/src/settings.c:1651
+#: ../cli/src/settings.c:722
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (wyłączone)"
+
+#: ../cli/src/settings.c:724
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (włączone, preferowanie publicznego adresu IP)"
+
+#: ../cli/src/settings.c:726
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (włączone, preferowanie tymczasowego adresu IP)"
+
+#: ../cli/src/settings.c:738
+msgid "0 (none)"
+msgstr "0 (brak)"
+
+#: ../cli/src/settings.c:744
+msgid "agent-owned, "
+msgstr "posiadane przez agenta, "
+
+#: ../cli/src/settings.c:746
+msgid "not saved, "
+msgstr "niezapisane, "
+
+#: ../cli/src/settings.c:748
+msgid "not required, "
+msgstr "niewymagane, "
+
+#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163
+#: ../cli/src/settings.c:1904
 msgid "auto"
 msgstr "automatyczne"
 
-#: ../cli/src/utils.c:103
+#: ../cli/src/utils.c:105
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr "Błąd podczas konwertowania adresu IPv4 \"0x%X\" na formę tekstową"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:133
 #, c-format
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Błąd podczas konwertowania adresu IPv6 \"%s\" na formę tekstową"
 
-#: ../cli/src/utils.c:232
+#: ../cli/src/utils.c:234
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "pole \"%s\" musi być same"
 
-#: ../cli/src/utils.c:235
+#: ../cli/src/utils.c:237
 #, c-format
 msgid "invalid field '%s'"
 msgstr "nieprawidłowe pole \"%s\""
 
-#: ../cli/src/utils.c:254
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opcja \"--terse\" wymaga podania opcji \"--fields\""
 
-#: ../cli/src/utils.c:258
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Opcja \"--terse\" wymaga konkretnej wartości opcji \"--fields\", nie \"%s\""
 
-#: ../cli/src/utils.c:468
+#: ../cli/src/utils.c:470
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Błąd: nie można utworzyć pośrednika obiektu usługi D-Bus dla org.freedesktop."
 "DBus"
 
-#: ../cli/src/utils.c:476
+#: ../cli/src/utils.c:478
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Błąd: żądanie NameHasOwner się nie powiodło: %s"
 
-#: ../cli/src/utils.c:521
+#: ../cli/src/utils.c:523
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1908,7 +2009,7 @@ msgstr ""
 "Ostrzeżenie: wersje programu nmcli (%s) i usługi NetworkManager (%s) się nie "
 "zgadzają. Użycie opcji --nocheck ukrywa ostrzeżenie.\n"
 
-#: ../cli/src/utils.c:530
+#: ../cli/src/utils.c:532
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -1968,81 +2069,81 @@ msgstr "Uszkodzony plik PEM: nieznany szyfr klucza prywatnego: \"%s\"."
 msgid "Could not decode private key."
 msgstr "Nie można zdekodować klucza prywatnego."
 
-#: ../libnm-util/crypto.c:284
+#: ../libnm-util/crypto.c:290
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr ""
 "Odnalezienie oczekiwanego znacznika początkowego PKCS#8 się nie powiodło."
 
-#: ../libnm-util/crypto.c:292
+#: ../libnm-util/crypto.c:298
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr ""
 "Odnalezienie oczekiwanego znacznika końcowego PKCS#8 \"%s\" się nie powiodło."
 
-#: ../libnm-util/crypto.c:312
+#: ../libnm-util/crypto.c:318
 msgid "Not enough memory to store private key data."
 msgstr ""
 "Brak wystarczającej ilości pamięci do przechowania danych klucza prywatnego."
 
-#: ../libnm-util/crypto.c:317
+#: ../libnm-util/crypto.c:323
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Odkodowanie klucza prywatnego PKCS#8 się nie powiodło."
 
-#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
+#: ../libnm-util/crypto.c:345 ../libnm-util/crypto.c:631
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Brak wystarczającej ilości pamięci do przechowania danych certyfikatu."
 
-#: ../libnm-util/crypto.c:365
+#: ../libnm-util/crypto.c:371
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "Liczba bajtów w IV musi być liczbą parzystą."
 
-#: ../libnm-util/crypto.c:374
+#: ../libnm-util/crypto.c:380
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "Brak wystarczającej ilości pamięci do przechowania IV."
 
-#: ../libnm-util/crypto.c:385
+#: ../libnm-util/crypto.c:391
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV zawiera nieszesnastkowe cyfry."
 
-#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto.c:429 ../libnm-util/crypto_gnutls.c:147
 #: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
 #: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Nieznany szyfr klucza prywatnego \"%s\"."
 
-#: ../libnm-util/crypto.c:432
+#: ../libnm-util/crypto.c:438
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "Brak wystarczającej ilości pamięci do odszyfrowania klucza prywatnego."
 
-#: ../libnm-util/crypto.c:497
+#: ../libnm-util/crypto.c:503
 #, c-format
 msgid "Not enough memory to store decrypted private key."
 msgstr ""
 "Brak wystarczającej ilości pamięci do przechowania odszyfrowanego klucza "
 "prywatnego."
 
-#: ../libnm-util/crypto.c:542
+#: ../libnm-util/crypto.c:548
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Nie można określić typu klucza prywatnego."
 
-#: ../libnm-util/crypto.c:597
+#: ../libnm-util/crypto.c:603
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "Certyfikat PEM nie zawiera początkowego znacznika \"%s\"."
 
-#: ../libnm-util/crypto.c:606
+#: ../libnm-util/crypto.c:612
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "Certyfikat PEM nie zawiera kończącego znacznika \"%s\"."
 
-#: ../libnm-util/crypto.c:630
+#: ../libnm-util/crypto.c:636
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "Zdekodowanie certyfikatu się nie powiodło."
@@ -2273,42 +2374,42 @@ msgstr "Nie można zweryfikować pliku PKCS#12: %d"
 msgid "Could not generate random data."
 msgstr "Nie można utworzyć losowych danych."
 
-#: ../libnm-util/nm-utils.c:2040
+#: ../libnm-util/nm-utils.c:2157
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Brak wystarczającej ilości pamięci, aby utworzyć klucz szyfrowania."
 
-#: ../libnm-util/nm-utils.c:2150
+#: ../libnm-util/nm-utils.c:2267
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Nie można przydzielić pamięci do utworzenia pliku PEM."
 
-#: ../libnm-util/nm-utils.c:2162
+#: ../libnm-util/nm-utils.c:2279
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Nie można przydzielić pamięci do zapisywania IV do pliku PEM."
 
-#: ../libnm-util/nm-utils.c:2174
+#: ../libnm-util/nm-utils.c:2291
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Nie można przydzielić pamięci do zapisywania zaszyfrowanego klucza do pliku "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2193
+#: ../libnm-util/nm-utils.c:2310
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Nie można przydzielić pamięci dla danych pliku PEM."
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "Włączenie lub wyłączenie sieci systemowej"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
 msgstr ""
 "Polityka systemu powstrzymuje włączanie lub wyłączanie sieci systemowej"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -2316,201 +2417,217 @@ msgstr ""
 "Umieszczenie usługi NetworkManager w stanie uśpienia lub przebudzenie go "
 "(powinno być używane tylko przez systemowe zarządzanie zasilaniem)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "Polityka systemu powstrzymuje umieszczenie usługi NetworkManager w stanie "
 "uśpienia lub przebudzenie go"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "Włączenie lub wyłączenie urządzeń WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "Polityka systemu powstrzymuje włączanie lub wyłączanie urządzeń WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "Włączenie lub wyłączenie urządzeń komórkowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "Włączenie lub wyłączenie urządzeń komórkowych WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych "
 "WiMAX"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "Umożliwienie kontroli połączeń sieciowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "Polityka systemu powstrzymuje kontrolę połączeń sieciowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "Współdzielenie połączenia przez chronioną sieć WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "Polityka systemu powstrzymuje współdzielenie połączeń przez chronioną sieć "
 "WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "Współdzielenie połączenia przez otwartą sieć WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "Polityka systemu powstrzymuje współdzielenie połączeń przez otwartą sieć WiFi"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "Modyfikacja osobistych połączeń sieciowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr ""
 "Polityka systemu powstrzymuje modyfikację osobistych ustawień systemowych"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "Modyfikacja połączeń sieciowych dla wszystkich użytkowników"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr ""
 "Polityka systemu powstrzymuje modyfikację ustawień sieciowych dla wszystkich "
 "użytkowników"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "Modyfikacja trwałej systemowej nazwy komputera"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr ""
 "Polityka systemu powstrzymuje modyfikację trwałej systemowej nazwy komputera"
 
-#: ../src/main.c:158
+#: ../src/main.c:130
 #, c-format
 msgid "Failed to set signal mask: %d"
 msgstr "Ustawienie maski sygnału nie powiodło: %d"
 
-#: ../src/main.c:167
+#: ../src/main.c:139
 #, c-format
 msgid "Failed to create signal handling thread: %d"
 msgstr "Utworzenie wątku obsługującego sygnały się nie powiodło: %d"
 
-#: ../src/main.c:182
+#: ../src/main.c:154
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Otwarcie %s się nie powiodło: %s\n"
 
-#: ../src/main.c:188
+#: ../src/main.c:160
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Zapisanie do %s się nie powiodło: %s\n"
 
-#: ../src/main.c:193
+#: ../src/main.c:165
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Zamknięcie %s się nie powiodło: %s\n"
 
-#: ../src/main.c:236
+#: ../src/main.c:208
 #, c-format
 msgid "NetworkManager is already running (pid %ld)\n"
 msgstr "Usługa NetworkManager jest już uruchomiona (PID %ld)\n"
 
-#: ../src/main.c:376
+#: ../src/main.c:335
 msgid "Print NetworkManager version and exit"
 msgstr "Wyświetla wersję usługi NetworkManager i kończy działanie"
 
-#: ../src/main.c:377
+#: ../src/main.c:336
 msgid "Don't become a daemon"
 msgstr "Bez zmiany w usługę"
 
-#: ../src/main.c:378
+#: ../src/main.c:337
 msgid "Make all warnings fatal"
 msgstr "Wszystkie ostrzeżenia jako krytyczne"
 
-#: ../src/main.c:379
+#: ../src/main.c:338
 msgid "Specify the location of a PID file"
 msgstr "Podaje położenie pliku PID"
 
-#: ../src/main.c:379
+#: ../src/main.c:338
 msgid "filename"
 msgstr "nazwa pliku"
 
-#: ../src/main.c:380
+#: ../src/main.c:339
 msgid "State file location"
 msgstr "Położenie pliku stanu"
 
-#: ../src/main.c:380
+#: ../src/main.c:339
 msgid "/path/to/state.file"
 msgstr "/ścieżka/do/pliku.stanu"
 
-#: ../src/main.c:381
+#: ../src/main.c:340
 msgid "Config file location"
 msgstr "Położenie pliku konfiguracji"
 
-#: ../src/main.c:381
+#: ../src/main.c:340
 msgid "/path/to/config.file"
 msgstr "/ścieżka/do/pliku.konfiguracji"
 
-#: ../src/main.c:382
+#: ../src/main.c:341
 msgid "List of plugins separated by ','"
 msgstr "Lista wtyczek oddzielonych \",\""
 
-#: ../src/main.c:382
+#: ../src/main.c:341
 msgid "plugin1,plugin2"
 msgstr "wtyczka1,wtyczka2"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:384
+#: ../src/main.c:343
 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
 msgstr "Poziom dziennika: jeden z [ERR, WARN, INFO, DEBUG]"
 
 #. Translators: Do not translate the values in the square brackets
-#: ../src/main.c:387
+#: ../src/main.c:346
 msgid ""
 "Log domains separated by ',': any combination of\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL,ADSL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
 msgstr ""
 "Domeny dziennika oddzielone przez \",\": dowolne połączenie z\n"
-"                                          [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,"
-"DHCP4,DHCP6,PPP,\n"
-"                                           WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,"
-"SHARING,SUPPLICANT,\n"
-"                                           AGENTS,SETTINGS,SUSPEND,CORE,"
-"DEVICE,OLPC,WIMAX,\n"
-"                                           INFINIBAND,FIREWALL,ADSL]"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,"
+"BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,"
+"DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,"
+"CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+
+#: ../src/main.c:352
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Adres http(s) do sprawdzania łączności internetowej"
+
+#: ../src/main.c:353
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "Czas między sprawdzaniem łączności (w sekundach)"
+
+#: ../src/main.c:354
+msgid "The expected start of the response"
+msgstr "Oczekiwany początek odpowiedzi"
 
-#: ../src/main.c:400
+#: ../src/main.c:354
+msgid "Bingo!"
+msgstr "Bingo!"
+
+#: ../src/main.c:359
 #, c-format
 msgid "GModules are not supported on your platform!\n"
 msgstr "GModules nie są obsługiwane na tej platformie.\n"
 
-#: ../src/main.c:423
+#: ../src/main.c:378
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -2522,42 +2639,42 @@ msgstr ""
 "wybranie bezprzewodowych punktów dostępowych, z którymi karty\n"
 "sieciowe w komputerze powinny być powiązane."
 
-#: ../src/main.c:429
+#: ../src/main.c:384
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Nieprawidłowa opcja. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/main.c:439
+#: ../src/main.c:394
 #, c-format
 msgid "You must be root to run NetworkManager!\n"
 msgstr "Tylko root może uruchamiać usługę NetworkManager.\n"
 
-#: ../src/main.c:460
+#: ../src/main.c:427
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Odczytanie konfiguracji się nie powiodło: (%d) %s\n"
 
-#: ../src/main.c:471
+#: ../src/main.c:438
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Parametr --help wyświetli listę prawidłowych opcji.\n"
 
-#: ../src/main.c:478
+#: ../src/main.c:445
 #, c-format
 msgid "State file %s parsing failed: (%d) %s\n"
 msgstr "Przetworzenie pliku stanu %s się nie powiodło: (%d) %s\n"
 
-#: ../src/main.c:495
+#: ../src/main.c:462
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Nie można zmienić w usługę: %s [błąd %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139
 msgid "# Created by NetworkManager\n"
 msgstr "# Utworzony przez usługę NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -2583,134 +2700,173 @@ msgstr "nie można odnaleźć usługi \"dhcpcd\"."
 msgid "unsupported DHCP client '%s'"
 msgstr "nieobsługiwany klient DHCP \"%s\""
 
-#: ../src/dns-manager/nm-dns-manager.c:383
+#: ../src/dns-manager/nm-dns-manager.c:376
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
 
-#: ../src/dns-manager/nm-dns-manager.c:385
+#: ../src/dns-manager/nm-dns-manager.c:378
 msgid "The nameservers listed below may not be recognized."
 msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
 
-#: ../src/logging/nm-logging.c:131
+#: ../src/logging/nm-logging.c:142
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Nieznany poziom dziennika \"%s\""
 
-#: ../src/logging/nm-logging.c:156
+#: ../src/logging/nm-logging.c:188
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Nieznana domena dziennika \"%s\""
 
-#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325
+#: ../src/modem-manager/nm-modem-cdma.c:271
+#: ../src/modem-manager/nm-modem-broadband.c:553 ../src/nm-device-bt.c:338
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Połączenie CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321
+#: ../src/modem-manager/nm-modem-gsm.c:549
+#: ../src/modem-manager/nm-modem-broadband.c:531 ../src/nm-device-bt.c:334
 #, c-format
 msgid "GSM connection %d"
 msgstr "Połączenie GSM %d"
 
-#: ../src/nm-device-bond.c:191
+#: ../src/nm-device-bond.c:202
 #, c-format
 msgid "Bond connection %d"
 msgstr "Połączenie wiązane %d"
 
-#: ../src/nm-device-adsl.c:193
+#: ../src/nm-device-adsl.c:194
 #, c-format
 msgid "ADSL connection %d"
 msgstr "Połączenie ADSL %d"
 
-#: ../src/nm-device-bt.c:296
+#: ../src/nm-device-bridge.c:201
+#, c-format
+msgid "Bridge connection %d"
+msgstr "Połączenie mostkowane %d"
+
+#: ../src/nm-device-bt.c:309
 #, c-format
 msgid "PAN connection %d"
 msgstr "Połączenie PAN %d"
 
-#: ../src/nm-device-bt.c:329
+#: ../src/nm-device-bt.c:342
 #, c-format
 msgid "DUN connection %d"
 msgstr "Połączenie DUN %d"
 
-#: ../src/nm-device-ethernet.c:1327
+#: ../src/nm-device-ethernet.c:1320
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Połączenie PPPoE %d"
 
-#: ../src/nm-device-ethernet.c:1327 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1320 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Połączenie przewodowe %d"
 
-#: ../src/nm-device-infiniband.c:303
+#: ../src/nm-device-infiniband.c:299
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Połączenie InfiniBand %d"
 
-#: ../src/nm-device-olpc-mesh.c:303
+#: ../src/nm-device-olpc-mesh.c:293
 #, c-format
 msgid "Mesh %d"
 msgstr "Sieć kratowa %d"
 
-#: ../src/nm-device-vlan.c:362
+#: ../src/nm-device-vlan.c:331
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Połączenie VLAN %d"
 
-#: ../src/nm-manager.c:660
+#: ../src/nm-manager.c:751
 #, c-format
 msgid "VPN connection %d"
 msgstr "Połączenie VPN %d"
 
-#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272
-#: ../src/nm-netlink-monitor.c:695
+#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:273
+#: ../src/nm-netlink-monitor.c:714
 #, c-format
 msgid "error processing netlink message: %s"
 msgstr "błąd podczas przetwarzania komunikatu netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:251
+#: ../src/nm-netlink-monitor.c:252
 msgid "error occurred while waiting for data on socket"
 msgstr "wystąpił błąd podczas oczekiwania na dane na gnieździe"
 
-#: ../src/nm-netlink-monitor.c:296
+#: ../src/nm-netlink-monitor.c:297
 #, c-format
 msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
 "nie można połączyć się z netlink dla monitorowania stanu połączenia: %s"
 
-#: ../src/nm-netlink-monitor.c:307
+#: ../src/nm-netlink-monitor.c:308
 #, c-format
 msgid "unable to enable netlink handle credential passing: %s"
 msgstr ""
-"nie można włączyć przekazywania danych uwierzytelniających uchwytu netlink: %"
-"s"
+"nie można włączyć przekazywania danych uwierzytelniających uchwytu netlink: "
+"%s"
 
-#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390
+#: ../src/nm-netlink-monitor.c:331 ../src/nm-netlink-monitor.c:391
 #, c-format
 msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
 "nie można przydzielić uchwytu netlink dla monitorowania stanu połączenia: %s"
 
-#: ../src/nm-netlink-monitor.c:415
+#: ../src/nm-netlink-monitor.c:416
 #, c-format
 msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
 "nie można przydzielić pamięci podręcznej połączenia netlink dla "
 "monitorowania stanu połączenia: %s"
 
-#: ../src/nm-netlink-monitor.c:542
+#: ../src/nm-netlink-monitor.c:543
 #, c-format
 msgid "unable to join netlink group: %s"
 msgstr "nie można dołączyć do grupy netlink: %s"
 
-#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684
+#: ../src/nm-netlink-monitor.c:690 ../src/nm-netlink-monitor.c:703
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "błąd podczas aktualizowania pamięci podręcznej połączenia: %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:94
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "Systemowe"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3641
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3705
 msgid "Bond"
 msgstr "Wiązane"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3898
+msgid "Bridge"
+msgstr "Mostek"
+
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\rŁączenie"
+
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (default is 30)"
+msgstr "Czas oczekiwania na połączenie, w sekundach (domyślnie 30)"
+
+#: ../test/nm-online.c:143
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"Kończy działanie od razu, jeśli usługa NetworkManager nie jest uruchomiona "
+"lub w trakcie łączenia"
+
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "Bez wyświetlania czegokolwiek"
+
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr "Oczekuje na pomyślne połączenie w usłudze NetworkManager."
+
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Nieprawidłowa opcja. Parametr --help wyświetli listę prawidłowych opcji."