about summary refs log tree commit diff
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po3471
1 files changed, 1811 insertions, 1660 deletions
diff --git a/po/ja.po b/po/ja.po
index 35f7d47d..022bfef8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,12 +7,13 @@
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
 # Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 # Lubomir Rintel <lkundrak@v3.sk>, 2017. #zanata
+# Thomas Haller <thaller@redhat.com>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-16 16:07+0100\n"
-"PO-Revision-Date: 2017-01-16 09:13-0500\n"
+"POT-Creation-Date: 2017-05-10 10:43+0200\n"
+"PO-Revision-Date: 2017-03-22 09:54-0400\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -87,31 +88,31 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/agent.c:156
+#: ../clients/cli/agent.c:157
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli は NetworkManager のシークレットエージェントとして適切に登録されまし"
 "た。\n"
 
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:159
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "エラー: シークレットエージェントの初期化に失敗しました"
 
-#: ../clients/cli/agent.c:176
+#: ../clients/cli/agent.c:178
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
 
-#: ../clients/cli/agent.c:184
+#: ../clients/cli/agent.c:186
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
 
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:53
 #: ../clients/cli/common.c:61 ../clients/cli/common.c:73
-#: ../clients/cli/connections.c:211 ../clients/cli/connections.c:233
+#: ../clients/cli/connections.c:224 ../clients/cli/connections.c:246
 msgid "GROUP"
 msgstr "グループ"
 
@@ -123,7 +124,7 @@ msgstr "アドレス"
 #. 1
 #. 2
 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63
-#: ../clients/cli/connections.c:236
+#: ../clients/cli/connections.c:249
 msgid "GATEWAY"
 msgstr "ゲートウェイ"
 
@@ -152,7 +153,7 @@ msgstr "WINS"
 msgid "OPTION"
 msgstr "オプション"
 
-#: ../clients/cli/common.c:378 ../clients/cli/common.c:440
+#: ../clients/cli/common.c:378 ../clients/cli/common.c:449
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
@@ -162,464 +163,467 @@ msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
 msgid "invalid IP address: %s"
 msgstr "無効な IP アドレス: %s"
 
-#: ../clients/cli/common.c:452
-#, c-format
+#: ../clients/cli/common.c:426
+#, fuzzy
 msgid ""
-"the second component of route ('%s') is neither a next hop address nor a "
-"metric"
-msgstr ""
-"ルートの 2 番目の部分 ('%s') は、ネクストホップアドレスでもなく、メトリックで"
-"もありません"
+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
+"ip[/prefix] ...]'"
+msgstr "'%s' は無効です (書式: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/common.c:462
+#: ../clients/cli/common.c:458
 #, c-format
-msgid "invalid metric '%s'"
-msgstr "無効なメトリック '%s'"
+msgid "the next hop ('%s') must be first"
+msgstr ""
 
-#: ../clients/cli/common.c:471
+#: ../clients/cli/common.c:464
 #, c-format
-msgid "invalid route: %s"
+msgid "the metric ('%s') must be before attributes"
+msgstr ""
+
+#: ../clients/cli/common.c:504
+#, fuzzy, c-format
+msgid "invalid route: %s. "
 msgstr "無効なルート: %s"
 
-#: ../clients/cli/common.c:483
+#: ../clients/cli/common.c:516
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
 
-#: ../clients/cli/common.c:500
+#: ../clients/cli/common.c:542
 msgid "unmanaged"
 msgstr "管理無し"
 
-#: ../clients/cli/common.c:502
+#: ../clients/cli/common.c:544
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../clients/cli/common.c:504 ../clients/cli/general.c:248
+#: ../clients/cli/common.c:546 ../clients/cli/general.c:248
 msgid "disconnected"
 msgstr "切断済み"
 
-#: ../clients/cli/common.c:506
+#: ../clients/cli/common.c:548
 msgid "connecting (prepare)"
 msgstr "接続中(準備)"
 
-#: ../clients/cli/common.c:508
+#: ../clients/cli/common.c:550
 msgid "connecting (configuring)"
 msgstr "接続中(設定中)"
 
-#: ../clients/cli/common.c:510
+#: ../clients/cli/common.c:552
 msgid "connecting (need authentication)"
 msgstr "接続中(認証が必要)"
 
-#: ../clients/cli/common.c:512
+#: ../clients/cli/common.c:554
 msgid "connecting (getting IP configuration)"
 msgstr "接続中(IP 設定を取得中)"
 
-#: ../clients/cli/common.c:514
+#: ../clients/cli/common.c:556
 msgid "connecting (checking IP connectivity)"
 msgstr "接続中(IP の接続性チェック)"
 
-#: ../clients/cli/common.c:516
+#: ../clients/cli/common.c:558
 msgid "connecting (starting secondary connections)"
 msgstr "接続中(セカンダリ接続を開始)"
 
-#: ../clients/cli/common.c:518 ../clients/cli/general.c:244
+#: ../clients/cli/common.c:560 ../clients/cli/general.c:244
 msgid "connected"
 msgstr "接続済み"
 
-#: ../clients/cli/common.c:520 ../clients/cli/connections.c:628
+#: ../clients/cli/common.c:562 ../clients/cli/connections.c:647
 msgid "deactivating"
 msgstr "停止中"
 
-#: ../clients/cli/common.c:522
+#: ../clients/cli/common.c:564
 msgid "connection failed"
 msgstr "接続に失敗"
 
-#: ../clients/cli/common.c:524 ../clients/cli/common.c:541
-#: ../clients/cli/connections.c:633 ../clients/cli/connections.c:656
-#: ../clients/cli/connections.c:2136 ../clients/cli/devices.c:1190
-#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1233
-#: ../clients/cli/general.c:251 ../clients/cli/general.c:289
-#: ../clients/cli/general.c:437 ../clients/cli/general.c:452
-#: ../clients/cli/settings.c:869 ../clients/cli/settings.c:955
-#: ../clients/cli/settings.c:1402 ../clients/cli/settings.c:2065
-#: ../clients/cli/settings.c:3533
+#: ../clients/cli/common.c:566 ../clients/cli/common.c:583
+#: ../clients/cli/connections.c:652 ../clients/cli/connections.c:675
+#: ../clients/cli/devices.c:1193 ../clients/cli/devices.c:1235
+#: ../clients/cli/devices.c:1237 ../clients/cli/general.c:251
+#: ../clients/cli/general.c:289 ../clients/cli/general.c:431
+#: ../clients/cli/general.c:446 ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:1012 ../clients/cli/settings.c:2806
+#: ../clients/cli/settings.c:2925 ../clients/cli/settings.c:5293
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:533 ../clients/cli/connections.c:944
-#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
-#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:1053
-#: ../clients/cli/connections.c:1054 ../clients/cli/connections.c:1056
-#: ../clients/cli/connections.c:3471 ../clients/cli/connections.c:4673
-#: ../clients/cli/connections.c:6492 ../clients/cli/connections.c:6493
-#: ../clients/cli/devices.c:868 ../clients/cli/devices.c:1155
-#: ../clients/cli/devices.c:1156 ../clients/cli/devices.c:1157
-#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159
-#: ../clients/cli/devices.c:1194 ../clients/cli/devices.c:1196
-#: ../clients/cli/devices.c:1224 ../clients/cli/devices.c:1225
-#: ../clients/cli/devices.c:1226 ../clients/cli/devices.c:1227
-#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229
-#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1232
-#: ../clients/cli/devices.c:1234 ../clients/cli/general.c:446
-#: ../clients/cli/settings.c:3528
+#: ../clients/cli/common.c:575 ../clients/cli/connections.c:963
+#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967
+#: ../clients/cli/connections.c:1002 ../clients/cli/connections.c:1072
+#: ../clients/cli/connections.c:1073 ../clients/cli/connections.c:1075
+#: ../clients/cli/connections.c:3512 ../clients/cli/connections.c:4747
+#: ../clients/cli/connections.c:6578 ../clients/cli/connections.c:6579
+#: ../clients/cli/devices.c:869 ../clients/cli/devices.c:1158
+#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1160
+#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1162
+#: ../clients/cli/devices.c:1197 ../clients/cli/devices.c:1199
+#: ../clients/cli/devices.c:1200 ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230
+#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1232
+#: ../clients/cli/devices.c:1233 ../clients/cli/devices.c:1234
+#: ../clients/cli/devices.c:1236 ../clients/cli/devices.c:1238
+#: ../clients/cli/general.c:440 ../clients/cli/settings.c:2801
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/common.c:535 ../clients/cli/connections.c:944
-#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
-#: ../clients/cli/connections.c:1053 ../clients/cli/connections.c:1054
-#: ../clients/cli/connections.c:1056 ../clients/cli/connections.c:3472
-#: ../clients/cli/connections.c:4672 ../clients/cli/connections.c:6492
-#: ../clients/cli/connections.c:6493 ../clients/cli/devices.c:868
-#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1156
-#: ../clients/cli/devices.c:1157 ../clients/cli/devices.c:1158
-#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1194
-#: ../clients/cli/devices.c:1196 ../clients/cli/devices.c:1224
-#: ../clients/cli/devices.c:1225 ../clients/cli/devices.c:1226
-#: ../clients/cli/devices.c:1227 ../clients/cli/devices.c:1228
-#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230
-#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1234
-#: ../clients/cli/general.c:448 ../clients/cli/settings.c:3530
+#: ../clients/cli/common.c:577 ../clients/cli/connections.c:963
+#: ../clients/cli/connections.c:965 ../clients/cli/connections.c:967
+#: ../clients/cli/connections.c:1072 ../clients/cli/connections.c:1073
+#: ../clients/cli/connections.c:1075 ../clients/cli/connections.c:3513
+#: ../clients/cli/connections.c:4746 ../clients/cli/connections.c:6578
+#: ../clients/cli/connections.c:6579 ../clients/cli/devices.c:869
+#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159
+#: ../clients/cli/devices.c:1160 ../clients/cli/devices.c:1161
+#: ../clients/cli/devices.c:1162 ../clients/cli/devices.c:1197
+#: ../clients/cli/devices.c:1199 ../clients/cli/devices.c:1200
+#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1231
+#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1233
+#: ../clients/cli/devices.c:1234 ../clients/cli/devices.c:1236
+#: ../clients/cli/devices.c:1238 ../clients/cli/general.c:442
+#: ../clients/cli/settings.c:2803
 msgid "no"
 msgstr "いいえ"
 
-#: ../clients/cli/common.c:537
+#: ../clients/cli/common.c:579
 msgid "yes (guessed)"
 msgstr "はい (推測)"
 
-#: ../clients/cli/common.c:539
+#: ../clients/cli/common.c:581
 msgid "no (guessed)"
 msgstr "いいえ (推測)"
 
-#: ../clients/cli/common.c:550
+#: ../clients/cli/common.c:592
 msgid "No reason given"
 msgstr "原因不明"
 
 #. We should not really come here
-#: ../clients/cli/common.c:553 ../clients/cli/connections.c:3320
+#: ../clients/cli/common.c:595 ../clients/cli/connections.c:3361
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../clients/cli/common.c:556
+#: ../clients/cli/common.c:598
 msgid "Device is now managed"
 msgstr "デバイスが管理下に置かれました"
 
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:601
 msgid "Device is now unmanaged"
 msgstr "デバイスが管理下から外れました"
 
-#: ../clients/cli/common.c:562
+#: ../clients/cli/common.c:604
 msgid "The device could not be readied for configuration"
 msgstr "デバイスの設定準備ができませんでした"
 
-#: ../clients/cli/common.c:565
+#: ../clients/cli/common.c:607
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
 
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:610
 msgid "The IP configuration is no longer valid"
 msgstr "この IP 設定は無効になりました"
 
-#: ../clients/cli/common.c:571
+#: ../clients/cli/common.c:613
 msgid "Secrets were required, but not provided"
 msgstr "秘密が必要でしたが入力されませんでした"
 
-#: ../clients/cli/common.c:574
+#: ../clients/cli/common.c:616
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X サプリカントが切断されました"
 
-#: ../clients/cli/common.c:577
+#: ../clients/cli/common.c:619
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X サプリカントの設定に失敗しました"
 
-#: ../clients/cli/common.c:580
+#: ../clients/cli/common.c:622
 msgid "802.1X supplicant failed"
 msgstr "802.1X サプリカントが失敗しました"
 
-#: ../clients/cli/common.c:583
+#: ../clients/cli/common.c:625
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
 
-#: ../clients/cli/common.c:586
+#: ../clients/cli/common.c:628
 msgid "PPP service failed to start"
 msgstr "PPP サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:589
+#: ../clients/cli/common.c:631
 msgid "PPP service disconnected"
 msgstr "PPP サービスの接続が切断されました"
 
-#: ../clients/cli/common.c:592
+#: ../clients/cli/common.c:634
 msgid "PPP failed"
 msgstr "PPP の失敗"
 
-#: ../clients/cli/common.c:595
+#: ../clients/cli/common.c:637
 msgid "DHCP client failed to start"
 msgstr "DHCP クライアントの開始に失敗しました"
 
-#: ../clients/cli/common.c:598
+#: ../clients/cli/common.c:640
 msgid "DHCP client error"
 msgstr "DHCP クライアントエラー"
 
-#: ../clients/cli/common.c:601
+#: ../clients/cli/common.c:643
 msgid "DHCP client failed"
 msgstr "DHCP クライアントの失敗"
 
-#: ../clients/cli/common.c:604
+#: ../clients/cli/common.c:646
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:607
+#: ../clients/cli/common.c:649
 msgid "Shared connection service failed"
 msgstr "共有接続サービスの失敗"
 
-#: ../clients/cli/common.c:610
+#: ../clients/cli/common.c:652
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:613
+#: ../clients/cli/common.c:655
 msgid "AutoIP service error"
 msgstr "AutoIP サービスエラー"
 
-#: ../clients/cli/common.c:616
+#: ../clients/cli/common.c:658
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスの失敗"
 
-#: ../clients/cli/common.c:619
+#: ../clients/cli/common.c:661
 msgid "The line is busy"
 msgstr "回線が使用中です"
 
-#: ../clients/cli/common.c:622
+#: ../clients/cli/common.c:664
 msgid "No dial tone"
 msgstr "ダイアル音がありません"
 
-#: ../clients/cli/common.c:625
+#: ../clients/cli/common.c:667
 msgid "No carrier could be established"
 msgstr "確立できるキャリアがありませんでした"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:670
 msgid "The dialing request timed out"
 msgstr "ダイアル要求がタイムアウトしました"
 
-#: ../clients/cli/common.c:631
+#: ../clients/cli/common.c:673
 msgid "The dialing attempt failed"
 msgstr "ダイアルの試行に失敗しました"
 
-#: ../clients/cli/common.c:634
+#: ../clients/cli/common.c:676
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:679
 msgid "Failed to select the specified APN"
 msgstr "指定された APN の選択に失敗しました"
 
-#: ../clients/cli/common.c:640
+#: ../clients/cli/common.c:682
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
-#: ../clients/cli/common.c:643
+#: ../clients/cli/common.c:685
 msgid "Network registration denied"
 msgstr "ネットワークの登録が拒否されました"
 
-#: ../clients/cli/common.c:646
+#: ../clients/cli/common.c:688
 msgid "Network registration timed out"
 msgstr "ネットワークの登録がタイムアウトしました"
 
-#: ../clients/cli/common.c:649
+#: ../clients/cli/common.c:691
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
-#: ../clients/cli/common.c:652
+#: ../clients/cli/common.c:694
 msgid "PIN check failed"
 msgstr "PIN 確認に失敗しました"
 
-#: ../clients/cli/common.c:655
+#: ../clients/cli/common.c:697
 msgid "Necessary firmware for the device may be missing"
 msgstr "このデバイスに必要なファームウェアがない可能性があります"
 
-#: ../clients/cli/common.c:658
+#: ../clients/cli/common.c:700
 msgid "The device was removed"
 msgstr "このデバイスは削除されました"
 
-#: ../clients/cli/common.c:661
+#: ../clients/cli/common.c:703
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager がスリープ状態に入りました"
 
-#: ../clients/cli/common.c:664
+#: ../clients/cli/common.c:706
 msgid "The device's active connection disappeared"
 msgstr "このデバイスのアクティブな接続が消滅しました"
 
-#: ../clients/cli/common.c:667
+#: ../clients/cli/common.c:709
 msgid "Device disconnected by user or client"
 msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
 
-#: ../clients/cli/common.c:670
+#: ../clients/cli/common.c:712
 msgid "Carrier/link changed"
 msgstr "キャリア/リンクが変更されました"
 
-#: ../clients/cli/common.c:673
+#: ../clients/cli/common.c:715
 msgid "The device's existing connection was assumed"
 msgstr "デバイスの既存の接続とみなされました"
 
-#: ../clients/cli/common.c:676
+#: ../clients/cli/common.c:718
 msgid "The supplicant is now available"
 msgstr "サプリカントが使用できるようになりました"
 
-#: ../clients/cli/common.c:679
+#: ../clients/cli/common.c:721
 msgid "The modem could not be found"
 msgstr "モデムが見つかりませんでした"
 
-#: ../clients/cli/common.c:682
+#: ../clients/cli/common.c:724
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
 
-#: ../clients/cli/common.c:685
+#: ../clients/cli/common.c:727
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM モデムの SIM カードが挿入されていません"
 
-#: ../clients/cli/common.c:688
+#: ../clients/cli/common.c:730
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM モデムの SIM PIN が必要です"
 
-#: ../clients/cli/common.c:691
+#: ../clients/cli/common.c:733
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM モデムの SIM PUK が必要です"
 
-#: ../clients/cli/common.c:694
+#: ../clients/cli/common.c:736
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM モデムの SIM が間違っています"
 
-#: ../clients/cli/common.c:697
+#: ../clients/cli/common.c:739
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand デバイスでは接続モードに対応していません"
 
-#: ../clients/cli/common.c:700
+#: ../clients/cli/common.c:742
 msgid "A dependency of the connection failed"
 msgstr "接続依存性の失敗"
 
-#: ../clients/cli/common.c:703
+#: ../clients/cli/common.c:745
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
 
-#: ../clients/cli/common.c:706
+#: ../clients/cli/common.c:748
 msgid "ModemManager is unavailable"
 msgstr "ModemManager は使用できません"
 
-#: ../clients/cli/common.c:709
+#: ../clients/cli/common.c:751
 msgid "The Wi-Fi network could not be found"
 msgstr "Wi-Fi ネットワークが見つかりませんでした"
 
-#: ../clients/cli/common.c:712
+#: ../clients/cli/common.c:754
 msgid "A secondary connection of the base connection failed"
 msgstr "ベース接続のセカンダリ接続に失敗しました"
 
-#: ../clients/cli/common.c:715
+#: ../clients/cli/common.c:757
 msgid "DCB or FCoE setup failed"
 msgstr "DCB または FCoE のセットアップに失敗しました"
 
-#: ../clients/cli/common.c:718
+#: ../clients/cli/common.c:760
 msgid "teamd control failed"
 msgstr "teamd の制御に失敗しました"
 
-#: ../clients/cli/common.c:721
+#: ../clients/cli/common.c:763
 msgid "Modem failed or no longer available"
 msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
 
-#: ../clients/cli/common.c:724
+#: ../clients/cli/common.c:766
 msgid "Modem now ready and available"
 msgstr "モデムが準備されましたので利用可能です"
 
-#: ../clients/cli/common.c:727
+#: ../clients/cli/common.c:769
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN が間違っています"
 
-#: ../clients/cli/common.c:730
+#: ../clients/cli/common.c:772
 msgid "New connection activation was enqueued"
 msgstr "新規接続アクティベーションがキューに格納されました"
 
-#: ../clients/cli/common.c:733
+#: ../clients/cli/common.c:775
 msgid "The device's parent changed"
 msgstr "デバイスの親が変更されました"
 
-#: ../clients/cli/common.c:736
+#: ../clients/cli/common.c:778
 msgid "The device parent's management changed"
 msgstr "デバイスの親の管理が変更されました"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:740 ../libnm-glib/nm-device.c:1898
-#: ../libnm/nm-device.c:1700
+#: ../clients/cli/common.c:782 ../libnm-glib/nm-device.c:1860
+#: ../libnm/nm-device.c:1660
 msgid "Unknown"
 msgstr "不明"
 
-#: ../clients/cli/common.c:782
+#: ../clients/cli/common.c:824
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "無効な優先度マップ '%s'"
 
-#: ../clients/cli/common.c:789 ../clients/cli/common.c:795
+#: ../clients/cli/common.c:831 ../clients/cli/common.c:837
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
 
-#: ../clients/cli/common.c:869
+#: ../clients/cli/common.c:911
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr ""
 
-#: ../clients/cli/common.c:876
+#: ../clients/cli/common.c:918
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr ""
 
-#: ../clients/cli/common.c:888
+#: ../clients/cli/common.c:930
 #, fuzzy, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr "'%s' は有効な team 設定でもファイル名でもありません"
 
-#: ../clients/cli/common.c:891
+#: ../clients/cli/common.c:933
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr ""
 
-#: ../clients/cli/common.c:944
+#: ../clients/cli/common.c:986
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr ""
 
-#: ../clients/cli/common.c:951
+#: ../clients/cli/common.c:993
 #, fuzzy, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "インデックス '%s' は無効です"
 
-#: ../clients/cli/common.c:964
+#: ../clients/cli/common.c:1006
 #, fuzzy, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/common.c:967
+#: ../clients/cli/common.c:1009
 #, fuzzy, c-format
 msgid "Not a valid PAC Script"
 msgstr "は有効な MAC アドレスではありません"
 
-#: ../clients/cli/common.c:1090
+#: ../clients/cli/common.c:1132
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "エラー: openconnect が失敗しました: %s\n"
 
-#: ../clients/cli/common.c:1097
+#: ../clients/cli/common.c:1139
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "エラー: openconnect がステータス %d で失敗しました\n"
 
-#: ../clients/cli/common.c:1099
+#: ../clients/cli/common.c:1141
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
 
-#: ../clients/cli/common.c:1180
+#: ../clients/cli/common.c:1222
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -628,26 +632,26 @@ msgstr ""
 "警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
 "ask' オプションがないと尋ねることができません。\n"
 
-#: ../clients/cli/common.c:1609 ../clients/nm-online.c:159
+#: ../clients/cli/common.c:1651
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
 
-#: ../clients/cli/common.c:1629
+#: ../clients/cli/common.c:1671
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager が起動していません。"
 
-#: ../clients/cli/common.c:1713
+#: ../clients/cli/common.c:1768
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 
-#: ../clients/cli/common.c:1723
+#: ../clients/cli/common.c:1778
 #, fuzzy
 msgid "Error: missing argument. Try passing --help."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/common.c:1776
+#: ../clients/cli/common.c:1831
 msgid "access denied"
 msgstr ""
 
@@ -699,7 +703,7 @@ msgstr "Bluetooth タイプ %s"
 msgid "Bonding mode"
 msgstr "ボンディングモニタリングモード %s"
 
-#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4257
+#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4320
 #, fuzzy
 msgid "Bonding monitoring mode"
 msgstr "ボンディングモニタリングモード %s"
@@ -734,39 +738,48 @@ msgstr "MACVLAN モード: "
 
 #: ../clients/cli/connections.c:111
 #, fuzzy
+msgid "MACsec mode"
+msgstr "MACVLAN モード: "
+
+#: ../clients/cli/connections.c:116
+msgid "Proxy method"
+msgstr ""
+
+#: ../clients/cli/connections.c:121
+#, fuzzy
 msgid "Connection (name, UUID, or path)"
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:112
+#: ../clients/cli/connections.c:122
 #, fuzzy
 msgid "VPN connection (name, UUID, or path)"
 msgstr "VPN 接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:113
+#: ../clients/cli/connections.c:123
 #, fuzzy
 msgid "Connection(s) (name, UUID, or path)"
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:114
+#: ../clients/cli/connections.c:124
 #, fuzzy
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr "接続 (名前、UUID またはパス): "
 
 #. 0
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:212
+#: ../clients/cli/connections.c:130 ../clients/cli/connections.c:225
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90
-#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138
-#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:221
-#: ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:139
+#: ../clients/cli/devices.c:152 ../clients/cli/devices.c:178
+#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:212 ../clients/cli/devices.c:222
+#: ../clients/cli/devices.c:263
 msgid "NAME"
 msgstr "名前"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:121 ../clients/cli/connections.c:213
+#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:226
 msgid "UUID"
 msgstr "UUID"
 
@@ -774,35 +787,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:122 ../clients/cli/connections.c:234
+#: ../clients/cli/connections.c:132 ../clients/cli/connections.c:247
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58
-#: ../clients/cli/devices.c:180
+#: ../clients/cli/devices.c:181
 msgid "TYPE"
 msgstr "タイプ"
 
 #. 2
-#: ../clients/cli/connections.c:123
+#: ../clients/cli/connections.c:133
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
 #. 3
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:134
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:125 ../clients/cli/devices.c:73
+#: ../clients/cli/connections.c:135 ../clients/cli/devices.c:73
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
 #. 5
-#: ../clients/cli/connections.c:126
+#: ../clients/cli/connections.c:136
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:127
+#: ../clients/cli/connections.c:137
 msgid "READONLY"
 msgstr "読み込み専用"
 
@@ -811,17 +824,17 @@ msgstr "読み込み専用"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:128 ../clients/cli/connections.c:220
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167
-#: ../clients/cli/devices.c:183
+#: ../clients/cli/connections.c:138 ../clients/cli/connections.c:233
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:168
+#: ../clients/cli/devices.c:184
 msgid "DBUS-PATH"
 msgstr "DBUS パス"
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:129 ../clients/cli/devices.c:165
-#: ../clients/cli/devices.c:182
+#: ../clients/cli/connections.c:139 ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:183
 msgid "ACTIVE"
 msgstr "アクティブ"
 
@@ -830,9 +843,9 @@ msgstr "アクティブ"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:130 ../clients/cli/devices.c:41
-#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164
-#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:263
+#: ../clients/cli/connections.c:140 ../clients/cli/devices.c:41
+#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:182 ../clients/cli/devices.c:264
 msgid "DEVICE"
 msgstr "デバイス"
 
@@ -841,47 +854,47 @@ msgstr "デバイス"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:215
+#: ../clients/cli/connections.c:141 ../clients/cli/connections.c:228
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67
 #: ../clients/cli/general.c:39
 msgid "STATE"
 msgstr "状態"
 
 #. 11
-#: ../clients/cli/connections.c:132
+#: ../clients/cli/connections.c:142
 msgid "ACTIVE-PATH"
 msgstr "ACTIVE-PATH"
 
 #. 12
-#: ../clients/cli/connections.c:133
+#: ../clients/cli/connections.c:143
 #, fuzzy
 msgid "SLAVE"
 msgstr "スレーブ"
 
 #. 2
-#: ../clients/cli/connections.c:214
+#: ../clients/cli/connections.c:227
 msgid "DEVICES"
 msgstr "デバイス"
 
 #. 4
-#: ../clients/cli/connections.c:216
+#: ../clients/cli/connections.c:229
 msgid "DEFAULT"
 msgstr "デフォルト"
 
 #. 5
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:230
 msgid "DEFAULT6"
 msgstr "デフォルト6"
 
 #. 6
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:231
 msgid "SPEC-OBJECT"
 msgstr "スペックオブジェクト"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:219 ../clients/cli/connections.c:257
-#: ../clients/cli/general.c:1131 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/cli/connections.c:232 ../clients/cli/connections.c:270
+#: ../clients/cli/general.c:1169 ../clients/tui/nm-editor-utils.c:241
 #: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr "VPN"
@@ -889,70 +902,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:47
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:47
 #: ../clients/cli/devices.c:79
 msgid "CON-PATH"
 msgstr "CON パス"
 
 #. 10
-#: ../clients/cli/connections.c:222
+#: ../clients/cli/connections.c:235
 msgid "ZONE"
 msgstr "ゾーン"
 
 #. 11
-#: ../clients/cli/connections.c:223
+#: ../clients/cli/connections.c:236
 msgid "MASTER-PATH"
 msgstr "マスターパス"
 
 #. 1
-#: ../clients/cli/connections.c:235
+#: ../clients/cli/connections.c:248
 msgid "USERNAME"
 msgstr "ユーザー名"
 
 #. 3
-#: ../clients/cli/connections.c:237
+#: ../clients/cli/connections.c:250
 msgid "BANNER"
 msgstr "バナー"
 
 #. 4
-#: ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:251
 msgid "VPN-STATE"
 msgstr "VPN の状態"
 
 #. 5
-#: ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:252
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:252 ../clients/cli/devices.c:236
+#: ../clients/cli/connections.c:265 ../clients/cli/devices.c:237
 msgid "GENERAL"
 msgstr "全般"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:253 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:266 ../clients/cli/devices.c:244
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:254 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:267 ../clients/cli/devices.c:245
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:255 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:268 ../clients/cli/devices.c:246
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:256 ../clients/cli/devices.c:246
+#: ../clients/cli/connections.c:269 ../clients/cli/devices.c:247
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:288
+#: ../clients/cli/connections.c:301
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -1029,7 +1042,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:310
+#: ../clients/cli/connections.c:323
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1078,7 +1091,7 @@ msgstr ""
 "関連するシークレットも表示する場合は、グローバルな --show-secrets オプション"
 "を使用します。\n"
 
-#: ../clients/cli/connections.c:331
+#: ../clients/cli/connections.c:344
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1122,7 +1135,7 @@ msgstr ""
 "passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:352
+#: ../clients/cli/connections.c:365
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1144,7 +1157,7 @@ msgstr ""
 "で識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:364
+#: ../clients/cli/connections.c:377
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1262,6 +1275,13 @@ msgid ""
 "                  [local <local endpoint IP>]\n"
 "                  [dev <parent device (ifname or connection UUID)>]\n"
 "\n"
+"    macsec:       dev <parent device (connection UUID, ifname, or MAC)>\n"
+"                  mode <psk|eap>\n"
+"                  [cak <key> ckn <key>]\n"
+"                  [encrypt yes|no]\n"
+"                  [port 1-65534]\n"
+"\n"
+"\n"
 "    macvlan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
 "                  mode vepa|bridge|private|passthru|source\n"
 "                  [tap yes|no]\n"
@@ -1274,6 +1294,8 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
+"    dummy:         \n"
+"\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
@@ -1286,147 +1308,8 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection add { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
-"[-- ([+|-]<setting>.<property> <value>)+]\n"
-"\n"
-"  COMMON_OPTIONS:\n"
-"                  type <タイプ>\n"
-"                  ifname <インターフェース名> | \"*\"\n"
-"                  [con-name <接続名>]\n"
-"                  [autoconnect yes|no]\n"
-"                  [save yes|no]\n"
-"                  [master <マスター (ifname、接続、UUID、または名前)>]\n"
-"                  [slave-type <マスター接続タイプ>]\n"
-"\n"
-"  TYPE_SPECIFIC_OPTIONS:\n"
-"    ethernet:     [mac <MAC アドレス>]\n"
-"                  [cloned-mac <クローン MAC アドレス>]\n"
-"                  [mtu <MTU>]\n"
-"\n"
-"    wifi:         ssid <SSID>\n"
-"                  [mac <MAC アドレス>]\n"
-"                  [cloned-mac <クローン MAC アドレス>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mode infrastructure|ap|adhoc]\n"
-"\n"
-"    wimax:        [mac <MAC アドレス>]\n"
-"                  [nsp <NSP>]\n"
-"\n"
-"    pppoe:        username <PPPoE ユーザー名>\n"
-"                  [password <PPPoE パスワード>]\n"
-"                  [service <PPPoE サービス名>]\n"
-"                  [mtu <MTU>]\n"
-"                  [mac <MAC アドレス>]\n"
-"\n"
-"    gsm:          apn <APN>\n"
-"                  [user <ユーザー名>]\n"
-"                  [password <パスワード>]\n"
-"\n"
-"    cdma:         [user <ユーザー名>]\n"
-"                  [password <パスワード>]\n"
-"\n"
-"    infiniband:   [mac <MAC アドレス>]\n"
-"                  [mtu <MTU>]\n"
-"                  [transport-mode datagram | connected]\n"
-"                  [parent <ifname>]\n"
-"                  [p-key <IPoIB P_Key>]\n"
-"\n"
-"    bluetooth:    [addr <bluetooth アドレス>]\n"
-"                  [bt-type panu|dun-gsm|dun-cdma]\n"
-"\n"
-"    vlan:         dev <親デバイス (接続 UUID、ifname、または MAC)>\n"
-"                  id <VLAN ID>\n"
-"                  [flags <VLAN フラグ>]\n"
-"                  [ingress <ingress 優先度マッピング>]\n"
-"                  [egress <egress 優先度マッピング>]\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"
-"                  [primary <ifname>]\n"
-"                  [miimon <数値>]\n"
-"                  [downdelay <数値>]\n"
-"                  [updelay <数値>]\n"
-"                  [arp-interval <数値>]\n"
-"                  [arp-ip-target <数値>]\n"
-"                  [lacp-rate slow (0) | fast (1)]\n"
-"\n"
-"    bond-slave:   master <マスター (ifname、接続 UUID、名前)>\n"
-"\n"
-"    team:         [config <ファイル>|<JSON 生データ>]\n"
-"\n"
-"    team-slave:   master <マスター (ifname、接続 UUID、または名前)>\n"
-"                  [config <ファイル>|<JSON 生データ>]\n"
-"\n"
-"    bridge:       [stp yes|no]\n"
-"                  [priority <数値>]\n"
-"                  [forward-delay <2-30>]\n"
-"                  [hello-time <1-10>]\n"
-"                  [max-age <6-40>]\n"
-"                  [ageing-time <0-1000000>]\n"
-"                  [multicast-snooping yes|no]\n"
-"                  [mac <MAC アドレス>]\n"
-"\n"
-"    bridge-slave: master <マスター (ifname、接続 UUID、または名前)>\n"
-"                  [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
-"ssh|l2tp|iodine|...\n"
-"                  [user <ユーザー名>]\n"
-"\n"
-"    olpc-mesh:    ssid <SSID>\n"
-"                  [channel <1-13>]\n"
-"                  [dhcp-anycast <MAC アドレス>]\n"
-"\n"
-"    adsl:         username <ユーザー名>\n"
-"                  protocol pppoa|pppoe|ipoatm\n"
-"                  [password <パスワード>]\n"
-"                  [encapsulation vcmux|llc]\n"
-"\n"
-"    tun:          mode tun|tap\n"
-"                  [owner <UID>]\n"
-"                  [group <GID>]\n"
-"                  [pi yes|no]\n"
-"                  [vnet-hdr yes|no]\n"
-"                  [multi-queue yes|no]\n"
-"\n"
-"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
-"                  remote <リモートエンドポイント IP>\n"
-"                  [local <ローカルエンドポイント IP>]\n"
-"                  [dev <親デバイス (ifname または接続 UUID)>]\n"
-"\n"
-"    macvlan:      dev <親デバイス (接続 UUID、ifname、または MAC)>\n"
-"                  mode vepa|bridge|private|passthru|source\n"
-"                  [tap yes|no]\n"
-"\n"
-"    vxlan:        id <VXLAN ID>\n"
-"                  remote <マルチキャストグループの IP またはリモートアドレス"
-">\n"
-"                  [local <ソース IP>]\n"
-"                  [dev <親デバイス (ifname または接続 UUID)>]\n"
-"                  [source-port-min <0-65535>]\n"
-"                  [source-port-max <0-65535>]\n"
-"                  [destination-port <0-65535>]\n"
-"\n"
-"  SLAVE_OPTIONS:\n"
-"    bridge:       [priority <0-63>]\n"
-"                  [path-cost <1-65535>]\n"
-"                  [hairpin yes|no]\n"
-"\n"
-"    team:         [config <ファイル>|<JSON 生データ>]\n"
-"\n"
-"  IP_OPTIONS:\n"
-"                  [ip4 <IPv4 アドレス>] [gw4 <IPv4 ゲートウェイ>]\n"
-"                  [ip6 <IPv6 アドレス>] [gw6 <IPv6 ゲートウェイ>]\n"
-"\n"
 
-#: ../clients/cli/connections.c:476
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1472,7 +1355,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:499
+#: ../clients/cli/connections.c:518
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1495,7 +1378,7 @@ msgstr ""
 "を除き <ID> の完全なコピーになります。\n"
 "\n"
 
-#: ../clients/cli/connections.c:511
+#: ../clients/cli/connections.c:530
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1522,7 +1405,7 @@ msgstr ""
 "インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:526
+#: ../clients/cli/connections.c:545
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1541,7 +1424,7 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:537
+#: ../clients/cli/connections.c:556
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1562,7 +1445,7 @@ msgstr ""
 "何も指定されない場合は、すべての接続プロファイルを監視します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:549
+#: ../clients/cli/connections.c:568
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1574,7 +1457,7 @@ msgstr ""
 "\n"
 "ディスクからすべての接続ファイルを再読み込みします。\n"
 
-#: ../clients/cli/connections.c:557
+#: ../clients/cli/connections.c:576
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1596,7 +1479,7 @@ msgstr ""
 "状態を認識させるため必ずこのコマンドを使用してください。\n"
 "\n"
 
-#: ../clients/cli/connections.c:569
+#: ../clients/cli/connections.c:588
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1620,7 +1503,7 @@ msgstr ""
 "NetworkManager VPN プラグインによりインポートされます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:582
+#: ../clients/cli/connections.c:601
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1639,234 +1522,269 @@ msgstr ""
 "データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:624
+#: ../clients/cli/connections.c:643
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:626
+#: ../clients/cli/connections.c:645
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:630
+#: ../clients/cli/connections.c:649
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:642
+#: ../clients/cli/connections.c:661
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続(準備)"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:663
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続(認証が必要)"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:665
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:648
+#: ../clients/cli/connections.c:667
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続(IP 設定を取得)"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:669
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:652
+#: ../clients/cli/connections.c:671
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:654
+#: ../clients/cli/connections.c:673
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:724
+#: ../clients/cli/connections.c:743
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:763
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:756 ../clients/cli/connections.c:1183
+#: ../clients/cli/connections.c:775 ../clients/cli/connections.c:1202
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:943 ../clients/cli/settings.c:2061
+#: ../clients/cli/connections.c:962 ../clients/cli/settings.c:5289
 msgid "never"
 msgstr "しない"
 
-#: ../clients/cli/connections.c:1171
+#: ../clients/cli/connections.c:1190
 #, fuzzy
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../clients/cli/connections.c:1407
+#: ../clients/cli/connections.c:1426
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 "無効なフィールド '%s'; 許可されたフィールド: %s および %s、または %s、%s"
 
-#: ../clients/cli/connections.c:1422 ../clients/cli/connections.c:1430
+#: ../clients/cli/connections.c:1441 ../clients/cli/connections.c:1449
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' は孤立する必要があります"
 
-#: ../clients/cli/connections.c:1630
+#: ../clients/cli/connections.c:1649
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "'--order' オプションの正しくない文字列 '%s'"
 
-#: ../clients/cli/connections.c:1656
+#: ../clients/cli/connections.c:1675
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "'--order' オプションの正しくないアイテム '%s'"
 
-#: ../clients/cli/connections.c:1686
+#: ../clients/cli/connections.c:1705
 #, fuzzy
 msgid "No connection specified"
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:1699
+#: ../clients/cli/connections.c:1720
 #, fuzzy, c-format
 msgid "%s argument is missing"
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:1709
+#: ../clients/cli/connections.c:1730
 #, fuzzy, c-format
 msgid "unknown connection '%s'"
 msgstr "エラー: 不明な接続 '%s'\n"
 
-#: ../clients/cli/connections.c:1750
+#: ../clients/cli/connections.c:1763
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数がありません"
 
 #. Add headers
-#: ../clients/cli/connections.c:1792
+#: ../clients/cli/connections.c:1801
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager のアクティブなプロファイル"
 
-#: ../clients/cli/connections.c:1793
+#: ../clients/cli/connections.c:1802
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../clients/cli/connections.c:1844 ../clients/cli/connections.c:2625
-#: ../clients/cli/connections.c:2635 ../clients/cli/connections.c:2645
-#: ../clients/cli/connections.c:2812 ../clients/cli/connections.c:8517
-#: ../clients/cli/connections.c:8528 ../clients/cli/devices.c:2640
-#: ../clients/cli/devices.c:2648 ../clients/cli/devices.c:2883
-#: ../clients/cli/devices.c:2891 ../clients/cli/devices.c:2907
-#: ../clients/cli/devices.c:2914 ../clients/cli/devices.c:2933
-#: ../clients/cli/devices.c:2941 ../clients/cli/devices.c:2956
-#: ../clients/cli/devices.c:3332 ../clients/cli/devices.c:3340
-#: ../clients/cli/devices.c:3346 ../clients/cli/devices.c:3356
-#: ../clients/cli/devices.c:3369 ../clients/cli/devices.c:3375
-#: ../clients/cli/devices.c:3547 ../clients/cli/devices.c:3556
-#: ../clients/cli/devices.c:3731
+#: ../clients/cli/connections.c:1872 ../clients/cli/connections.c:2617
+#: ../clients/cli/connections.c:2629 ../clients/cli/connections.c:2641
+#: ../clients/cli/connections.c:2817 ../clients/cli/connections.c:8656
+#: ../clients/cli/connections.c:8673 ../clients/cli/devices.c:2652
+#: ../clients/cli/devices.c:2662 ../clients/cli/devices.c:2898
+#: ../clients/cli/devices.c:2908 ../clients/cli/devices.c:2926
+#: ../clients/cli/devices.c:2935 ../clients/cli/devices.c:2956
+#: ../clients/cli/devices.c:2967 ../clients/cli/devices.c:2985
+#: ../clients/cli/devices.c:3363 ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3381 ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3408 ../clients/cli/devices.c:3416
+#: ../clients/cli/devices.c:3590 ../clients/cli/devices.c:3601
+#: ../clients/cli/devices.c:3771
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:1863
+#: ../clients/cli/connections.c:1891
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - そのような接続プロファイルはありません。"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/connections.c:2614
-#: ../clients/cli/connections.c:2673 ../clients/cli/connections.c:8042
-#: ../clients/cli/connections.c:8151 ../clients/cli/connections.c:8639
-#: ../clients/cli/devices.c:1496 ../clients/cli/devices.c:1554
-#: ../clients/cli/devices.c:1840 ../clients/cli/devices.c:2008
-#: ../clients/cli/devices.c:2115 ../clients/cli/devices.c:2303
-#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:3623
-#: ../clients/cli/devices.c:3737 ../clients/cli/devices.c:3795
-#: ../clients/cli/general.c:391 ../clients/cli/general.c:572
-#: ../clients/cli/general.c:615 ../clients/cli/general.c:642
-#: ../clients/cli/general.c:832 ../clients/cli/general.c:886
+#: ../clients/cli/connections.c:1955 ../clients/cli/connections.c:2604
+#: ../clients/cli/connections.c:2668 ../clients/cli/connections.c:8148
+#: ../clients/cli/connections.c:8259 ../clients/cli/connections.c:8787
+#: ../clients/cli/devices.c:1554 ../clients/cli/devices.c:1841
+#: ../clients/cli/devices.c:2010 ../clients/cli/devices.c:2118
+#: ../clients/cli/devices.c:2307 ../clients/cli/devices.c:3553
+#: ../clients/cli/devices.c:3777 ../clients/cli/general.c:603
+#: ../clients/cli/general.c:868
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:2025
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:2033
+#: ../clients/cli/connections.c:2061
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2081
 #, fuzzy, c-format
 msgid "device '%s' not compatible with connection '%s':"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:2089
+#: ../clients/cli/connections.c:2117
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:2092
+#: ../clients/cli/connections.c:2120
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:2112
-msgid "unknown reason"
+#: ../clients/cli/connections.c:2140
+#, fuzzy
+msgid "Unknown reason"
 msgstr "不明な理由"
 
-#: ../clients/cli/connections.c:2114 ../clients/cli/general.c:280
-msgid "none"
-msgstr "なし"
+#: ../clients/cli/connections.c:2142
+#, fuzzy
+msgid "The connection was disconnected"
+msgstr "接続はボンド接続ではありませんでした。"
 
-#: ../clients/cli/connections.c:2116
-msgid "the user was disconnected"
-msgstr "ユーザーの接続が切断されました。"
+#: ../clients/cli/connections.c:2144
+#, fuzzy
+msgid "Disconnected by user"
+msgstr "D-Bus により切断"
 
-#: ../clients/cli/connections.c:2118
-msgid "the base network connection was interrupted"
+#: ../clients/cli/connections.c:2146
+#, fuzzy
+msgid "The base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../clients/cli/connections.c:2120
-msgid "the VPN service stopped unexpectedly"
+#: ../clients/cli/connections.c:2148
+#, fuzzy
+msgid "The VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../clients/cli/connections.c:2122
-msgid "the VPN service returned invalid configuration"
+#: ../clients/cli/connections.c:2150
+#, fuzzy
+msgid "The VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../clients/cli/connections.c:2124
-msgid "the connection attempt timed out"
+#: ../clients/cli/connections.c:2152
+#, fuzzy
+msgid "The connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../clients/cli/connections.c:2126
-msgid "the VPN service did not start in time"
+#: ../clients/cli/connections.c:2154
+#, fuzzy
+msgid "The VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../clients/cli/connections.c:2128
-msgid "the VPN service failed to start"
+#: ../clients/cli/connections.c:2156
+#, fuzzy
+msgid "The VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../clients/cli/connections.c:2130
-msgid "no valid VPN secrets"
+#: ../clients/cli/connections.c:2158
+#, fuzzy
+msgid "No valid secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../clients/cli/connections.c:2132
-msgid "invalid VPN secrets"
+#: ../clients/cli/connections.c:2160
+#, fuzzy
+msgid "Invalid secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../clients/cli/connections.c:2134
-msgid "the connection was removed"
+#: ../clients/cli/connections.c:2162
+#, fuzzy
+msgid "The connection was removed"
 msgstr "接続は削除されました"
 
-#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:2193
-#: ../clients/cli/connections.c:2372 ../clients/cli/connections.c:6382
+#: ../clients/cli/connections.c:2164
+#, fuzzy
+msgid "Master connection failed"
+msgstr "接続に失敗"
+
+#: ../clients/cli/connections.c:2166
+#, fuzzy
+msgid "Could not create a software link"
+msgstr "一時ファイルを作成できませんでした: %s"
+
+#: ../clients/cli/connections.c:2168
+#, fuzzy
+msgid "The device disappeared"
+msgstr "このデバイスのアクティブな接続が消滅しました"
+
+#: ../clients/cli/connections.c:2171
+#, fuzzy
+msgid "Invalid reason"
+msgstr "無効なルート: %s"
+
+#: ../clients/cli/connections.c:2196 ../clients/cli/connections.c:2366
+#: ../clients/cli/connections.c:6468
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2164
+#: ../clients/cli/connections.c:2202 ../clients/cli/connections.c:2211
+#: ../clients/cli/connections.c:2346
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr "エラー: 接続のアクティベーションに失敗: %s"
+
+#: ../clients/cli/connections.c:2236
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1875,373 +1793,358 @@ msgstr ""
 "接続が正常にアクティベートされました (マスターはスレーブを待機しています) (D-"
 "Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2176 ../clients/cli/connections.c:2197
-#, c-format
-msgid "Error: Connection activation failed."
-msgstr "エラー: 接続のアクティベートに失敗しました。"
-
-#: ../clients/cli/connections.c:2245
-#, c-format
-msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
-msgstr "VPN 接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
-
-#: ../clients/cli/connections.c:2252
-#, c-format
-msgid "Error: Connection activation failed: %s."
-msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
-
-#: ../clients/cli/connections.c:2266
+#: ../clients/cli/connections.c:2261
 #, fuzzy, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/connections.c:2352
-#, c-format
-msgid "Error: Connection activation failed: %s"
-msgstr "エラー: 接続のアクティベーションに失敗: %s"
-
-#: ../clients/cli/connections.c:2441
+#: ../clients/cli/connections.c:2427
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2453
+#: ../clients/cli/connections.c:2439
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にコロンがありません"
 
-#: ../clients/cli/connections.c:2461
+#: ../clients/cli/connections.c:2447
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にドットがありません"
 
-#: ../clients/cli/connections.c:2474
+#: ../clients/cli/connections.c:2460
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' の設定名が無効です"
 
-#: ../clients/cli/connections.c:2530
+#: ../clients/cli/connections.c:2516
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2535
+#: ../clients/cli/connections.c:2521
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../clients/cli/connections.c:2655 ../clients/cli/devices.c:1502
-#: ../clients/cli/devices.c:2655 ../clients/cli/devices.c:2969
-#: ../clients/cli/devices.c:3562
+#: ../clients/cli/connections.c:2651 ../clients/cli/devices.c:1502
+#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2998
+#: ../clients/cli/devices.c:3607
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2681
+#: ../clients/cli/connections.c:2676
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2700
+#: ../clients/cli/connections.c:2696
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:2716
+#: ../clients/cli/connections.c:2712
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2790 ../clients/cli/connections.c:8260
-#: ../clients/cli/connections.c:8292 ../clients/cli/connections.c:8445
+#: ../clients/cli/connections.c:2793 ../clients/cli/connections.c:8374
+#: ../clients/cli/connections.c:8406 ../clients/cli/connections.c:8563
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:2829
+#: ../clients/cli/connections.c:2834
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
 
-#: ../clients/cli/connections.c:2830
+#: ../clients/cli/connections.c:2835
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブな一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:2839
+#: ../clients/cli/connections.c:2844
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:3300 ../clients/cli/utils.c:646
+#: ../clients/cli/connections.c:2878
+#, fuzzy, c-format
+msgid "Connection '%s' deactivation failed: %s\n"
+msgstr "エラー: 接続のアクティベーションに失敗: %s"
+
+#: ../clients/cli/connections.c:3341 ../clients/cli/utils.c:710
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
-#: ../clients/cli/connections.c:3460
+#: ../clients/cli/connections.c:3501
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
 
-#: ../clients/cli/connections.c:3634
+#: ../clients/cli/connections.c:3675
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr "エラー: '%s' 設定を作成する方法がわかりません。"
 
-#: ../clients/cli/connections.c:3645
+#: ../clients/cli/connections.c:3686
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/connections.c:3662
+#: ../clients/cli/connections.c:3703
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:3681
+#: ../clients/cli/connections.c:3722
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
 
-#: ../clients/cli/connections.c:3707
+#: ../clients/cli/connections.c:3748
 #, fuzzy, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "エラー: '%s' を繰り返すことはできません。"
 
-#: ../clients/cli/connections.c:3739
+#: ../clients/cli/connections.c:3780
 #, fuzzy, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3752
+#: ../clients/cli/connections.c:3793
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3939
+#: ../clients/cli/connections.c:4002
 #, fuzzy, c-format
 msgid "Error: bad connection type: %s."
 msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:4002
+#: ../clients/cli/connections.c:4065
 #, fuzzy, c-format
 msgid "Error: '%s': %s"
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/connections.c:4023
+#: ../clients/cli/connections.c:4086
 #, fuzzy
 msgid "Error: master is required"
 msgstr "エラー: 'マスター' が必要です。"
 
-#: ../clients/cli/connections.c:4082
+#: ../clients/cli/connections.c:4145
 #, fuzzy, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:4113
+#: ../clients/cli/connections.c:4176
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "エラー: '%s' は無効なモニタリングモードです; '%s' または '%s' を使用してくだ"
 "さい。\n"
 
-#: ../clients/cli/connections.c:4144
+#: ../clients/cli/connections.c:4207
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
 
-#: ../clients/cli/connections.c:4219
+#: ../clients/cli/connections.c:4282
 #, fuzzy
 msgid "PPPoE username"
 msgstr "PPPoE ユーザー名: "
 
-#: ../clients/cli/connections.c:4220 ../clients/cli/connections.c:4241
-#: ../clients/cli/connections.c:4243 ../clients/cli/connections.c:4292
+#: ../clients/cli/connections.c:4283 ../clients/cli/connections.c:4304
+#: ../clients/cli/connections.c:4306 ../clients/cli/connections.c:4355
 #, fuzzy
 msgid "Password [none]"
 msgstr "パスワード [none]: "
 
-#: ../clients/cli/connections.c:4221
+#: ../clients/cli/connections.c:4284
 #, fuzzy
 msgid "Service [none]"
 msgstr "サービス [none]: "
 
-#: ../clients/cli/connections.c:4222 ../clients/cli/connections.c:4225
-#: ../clients/cli/connections.c:4234
+#: ../clients/cli/connections.c:4285 ../clients/cli/connections.c:4288
+#: ../clients/cli/connections.c:4297
 #, fuzzy
 msgid "MTU [auto]"
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:4223 ../clients/cli/connections.c:4226
-#: ../clients/cli/connections.c:4235 ../clients/cli/connections.c:4238
-#: ../clients/cli/connections.c:4279
+#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4289
+#: ../clients/cli/connections.c:4298 ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4342
 #, fuzzy
 msgid "MAC [none]"
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:4224 ../clients/cli/connections.c:4236
+#: ../clients/cli/connections.c:4287 ../clients/cli/connections.c:4299
 #, fuzzy
 msgid "Cloned MAC [none]"
 msgstr "クローンの MAC [none]: "
 
-#: ../clients/cli/connections.c:4229
+#: ../clients/cli/connections.c:4292
 #, fuzzy
 msgid "Parent interface [none]"
 msgstr "親インターフェース [none]: "
 
-#: ../clients/cli/connections.c:4230
+#: ../clients/cli/connections.c:4293
 #, fuzzy
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]: "
 
 #. 0
-#: ../clients/cli/connections.c:4231 ../clients/cli/connections.c:4286
-#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:224
+#: ../clients/cli/connections.c:4294 ../clients/cli/connections.c:4349
+#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/cli/connections.c:4237
+#: ../clients/cli/connections.c:4300
 #, fuzzy
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP 名: "
 
-#: ../clients/cli/connections.c:4239
+#: ../clients/cli/connections.c:4302
 #, fuzzy
 msgid "APN"
 msgstr "AP"
 
-#: ../clients/cli/connections.c:4240 ../clients/cli/connections.c:4242
-#: ../clients/cli/connections.c:4285
+#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4348
 #, fuzzy
 msgid "Username [none]"
 msgstr "ユーザー名 [none]: "
 
-#: ../clients/cli/connections.c:4244
+#: ../clients/cli/connections.c:4307
 #, fuzzy
 msgid "Bluetooth device address"
 msgstr "Bluetooth デバイスアドレス: "
 
-#: ../clients/cli/connections.c:4247
+#: ../clients/cli/connections.c:4310
 #, fuzzy
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 親デバイスまたは接続 UUID: "
 
-#: ../clients/cli/connections.c:4249
+#: ../clients/cli/connections.c:4312
 #, fuzzy
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:4250
+#: ../clients/cli/connections.c:4313
 #, fuzzy
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4314
 #, fuzzy
 msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:4252
+#: ../clients/cli/connections.c:4315
 #, fuzzy
 msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:4255
+#: ../clients/cli/connections.c:4318
 #, fuzzy
 msgid "Bonding primary interface [none]"
 msgstr "ボンドのプライマリインターフェース [none]:"
 
-#: ../clients/cli/connections.c:4259
+#: ../clients/cli/connections.c:4322
 #, fuzzy
 msgid "Bonding miimon [100]"
 msgstr "ボンドの miimon [100]:"
 
-#: ../clients/cli/connections.c:4260
+#: ../clients/cli/connections.c:4323
 #, fuzzy
 msgid "Bonding downdelay [0]"
 msgstr "ボンドの downdelay [0]: "
 
-#: ../clients/cli/connections.c:4261
+#: ../clients/cli/connections.c:4324
 #, fuzzy
 msgid "Bonding updelay [0]"
 msgstr "ボンドの updelay [0]: "
 
-#: ../clients/cli/connections.c:4262
+#: ../clients/cli/connections.c:4325
 #, fuzzy
 msgid "Bonding arp-interval [0]"
 msgstr "ボンドの arp-interval [0]: "
 
-#: ../clients/cli/connections.c:4264
+#: ../clients/cli/connections.c:4327
 #, fuzzy
 msgid "Bonding arp-ip-target [none]"
 msgstr "ボンドの arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:4266
+#: ../clients/cli/connections.c:4329
 #, fuzzy
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('低速' または '高速') [低速]: "
 
-#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4269
+#: ../clients/cli/connections.c:4331 ../clients/cli/connections.c:4332
 #, fuzzy
 msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]: "
 
-#: ../clients/cli/connections.c:4270
+#: ../clients/cli/connections.c:4333
 #, fuzzy
 msgid "Enable STP [no]"
 msgstr "STP %s の有効化 "
 
-#: ../clients/cli/connections.c:4272
+#: ../clients/cli/connections.c:4335
 #, fuzzy
 msgid "STP priority [32768]"
 msgstr "STP の優先度 [32768]: "
 
-#: ../clients/cli/connections.c:4273
+#: ../clients/cli/connections.c:4336
 #, fuzzy
 msgid "Forward delay [15]"
 msgstr "フォワード遅延 [15]:"
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4337
 #, fuzzy
 msgid "Hello time [2]"
 msgstr "Hello タイム [2]: "
 
-#: ../clients/cli/connections.c:4275
+#: ../clients/cli/connections.c:4338
 #, fuzzy
 msgid "Max age [20]"
 msgstr "最大エイジ [20]: "
 
-#: ../clients/cli/connections.c:4276
+#: ../clients/cli/connections.c:4339
 #, fuzzy
 msgid "MAC address ageing time [300]"
 msgstr "MAC アドレスのエージングタイム [300]:"
 
-#: ../clients/cli/connections.c:4277
+#: ../clients/cli/connections.c:4340
 #, fuzzy
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP スヌーピングの有効化"
 
-#: ../clients/cli/connections.c:4280
+#: ../clients/cli/connections.c:4343
 #, fuzzy
 msgid "Bridge port priority [32]"
 msgstr "ブリッジポートの優先度 [32]:"
 
-#: ../clients/cli/connections.c:4281
+#: ../clients/cli/connections.c:4344
 #, fuzzy
 msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジポートの STP パスコスト [100]: "
 
-#: ../clients/cli/connections.c:4282
+#: ../clients/cli/connections.c:4345
 #, fuzzy
 msgid "Hairpin [no]"
 msgstr "ヘアピンモード"
 
-#: ../clients/cli/connections.c:4287
+#: ../clients/cli/connections.c:4350
 #, fuzzy
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュチャンネル [1]: "
 
-#: ../clients/cli/connections.c:4288
+#: ../clients/cli/connections.c:4351
 #, fuzzy
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]: "
@@ -2250,301 +2153,322 @@ msgstr "DHCP anycast MAC アドレス [none]: "
 #. * is not visible here since we only care about phase2 authentication
 #. * (and don't even care of which one)
 #.
-#: ../clients/cli/connections.c:4289
+#: ../clients/cli/connections.c:4352
 #: ../clients/common/nm-secret-agent-simple.c:223
 #: ../clients/common/nm-secret-agent-simple.c:328
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../clients/cli/connections.c:4295
+#: ../clients/cli/connections.c:4358
+msgid "MACsec parent device or connection UUID"
+msgstr ""
+
+#: ../clients/cli/connections.c:4360
+msgid "Enable encryption [yes]"
+msgstr ""
+
+#: ../clients/cli/connections.c:4361
+#: ../clients/common/nm-secret-agent-simple.c:520
+msgid "MKA CAK"
+msgstr ""
+
+#: ../clients/cli/connections.c:4362
+msgid "MKA_CKN"
+msgstr ""
+
+#: ../clients/cli/connections.c:4363
+msgid "SCI port [1]"
+msgstr ""
+
+#: ../clients/cli/connections.c:4365
 #, fuzzy
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 親デバイスまたは接続 UUID: "
 
-#: ../clients/cli/connections.c:4299
+#: ../clients/cli/connections.c:4369
 msgid "Tap [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4371
 #, fuzzy
 msgid "VXLAN ID"
 msgstr "VXLAN ID: "
 
-#: ../clients/cli/connections.c:4302 ../clients/cli/connections.c:4321
+#: ../clients/cli/connections.c:4372 ../clients/cli/connections.c:4391
 #, fuzzy
 msgid "Remote"
 msgstr "リモート: "
 
-#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4322
+#: ../clients/cli/connections.c:4373 ../clients/cli/connections.c:4392
 #, fuzzy
 msgid "Parent device [none]"
 msgstr "親デバイス [none]: "
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4375
 #, fuzzy
 msgid "Local address [none]"
 msgstr "ローカルアドレス [none]: "
 
-#: ../clients/cli/connections.c:4306
+#: ../clients/cli/connections.c:4376
 #, fuzzy
 msgid "Minimum source port [0]"
 msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4307
+#: ../clients/cli/connections.c:4377
 #, fuzzy
 msgid "Maximum source port [0]"
 msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4308
+#: ../clients/cli/connections.c:4378
 #, fuzzy
 msgid "Destination port [8472]"
 msgstr "送信先ポート [8472]: "
 
-#: ../clients/cli/connections.c:4311
+#: ../clients/cli/connections.c:4381
 #, fuzzy
 msgid "User ID [none]"
 msgstr "ユーザー ID [none]: "
 
-#: ../clients/cli/connections.c:4312
+#: ../clients/cli/connections.c:4382
 #, fuzzy
 msgid "Group ID [none]"
 msgstr "グループ ID [none]: "
 
-#: ../clients/cli/connections.c:4313
+#: ../clients/cli/connections.c:4383
 #, fuzzy
 msgid "Enable PI [no]"
 msgstr "PI %s の有効化"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4385
 #, fuzzy
 msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー %s の有効化"
 
-#: ../clients/cli/connections.c:4317
+#: ../clients/cli/connections.c:4387
 #, fuzzy
 msgid "Enable multi queue [no]"
 msgstr "複数のキュー %s の有効化"
 
-#: ../clients/cli/connections.c:4320
+#: ../clients/cli/connections.c:4390
 #, fuzzy
 msgid "Local endpoint [none]"
 msgstr "ローカルエンドポイント [none]: "
 
-#: ../clients/cli/connections.c:4324
+#: ../clients/cli/connections.c:4394
 #, fuzzy
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 アドレス (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4326
+#: ../clients/cli/connections.c:4396
 #, fuzzy
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 ゲートウェイ [none]: "
 
-#: ../clients/cli/connections.c:4327
+#: ../clients/cli/connections.c:4397
 #, fuzzy
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 アドレス (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4329
+#: ../clients/cli/connections.c:4399
 #, fuzzy
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 ゲートウェイ [none]: "
 
-#: ../clients/cli/connections.c:4330
-msgid "Proxy method"
-msgstr ""
-
-#: ../clients/cli/connections.c:4331
-msgid "Browser Only"
+#: ../clients/cli/connections.c:4401
+msgid "Browser only [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4332
-msgid "PAC Url"
+#: ../clients/cli/connections.c:4403
+msgid "PAC URL"
 msgstr ""
 
-#: ../clients/cli/connections.c:4333
-msgid "PAC Script"
+#: ../clients/cli/connections.c:4404
+msgid "PAC script"
 msgstr ""
 
-#: ../clients/cli/connections.c:4468
+#: ../clients/cli/connections.c:4539
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' の値が不明です。"
 
-#: ../clients/cli/connections.c:4513
+#: ../clients/cli/connections.c:4585
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4608
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:4560
+#: ../clients/cli/connections.c:4633
 #, fuzzy, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/connections.c:4574
+#: ../clients/cli/connections.c:4647
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "エラー: 無効な <setting>.<property> '%s' です。"
 
-#: ../clients/cli/connections.c:4615 ../clients/cli/connections.c:8093
+#: ../clients/cli/connections.c:4689 ../clients/cli/connections.c:8199
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
 
-#: ../clients/cli/connections.c:4620
+#: ../clients/cli/connections.c:4694
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../clients/cli/connections.c:4738
+#: ../clients/cli/connections.c:4816
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr ""
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4854
 #, fuzzy, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] "'%2$s' 接続タイプには %1$d 種類のオプション引数があります。\n"
 
-#: ../clients/cli/connections.c:4779
+#: ../clients/cli/connections.c:4857
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "指定しますか? %s"
 
-#: ../clients/cli/connections.c:4793
+#: ../clients/cli/connections.c:4871
 #, fuzzy
 msgid "Wired Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:4795 ../src/devices/nm-device-infiniband.c:186
+#: ../clients/cli/connections.c:4873 ../src/devices/nm-device-infiniband.c:192
 msgid "InfiniBand connection"
 msgstr "InfiniBand 接続"
 
-#: ../clients/cli/connections.c:4797
+#: ../clients/cli/connections.c:4875
 #, fuzzy
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/cli/connections.c:4799
+#: ../clients/cli/connections.c:4877
 #, fuzzy
 msgid "WiMAX connection"
 msgstr "CDMA 接続"
 
-#: ../clients/cli/connections.c:4801
+#: ../clients/cli/connections.c:4879
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:4803
+#: ../clients/cli/connections.c:4881
 #, fuzzy
 msgid "CDMA mobile broadband connection"
 msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:4805
+#: ../clients/cli/connections.c:4883
 #, fuzzy
 msgid "GSM mobile broadband connection"
 msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:4807
+#: ../clients/cli/connections.c:4885
 #, fuzzy
 msgid "bluetooth connection"
 msgstr "ボンド接続"
 
-#: ../clients/cli/connections.c:4809 ../src/devices/nm-device-vlan.c:432
+#: ../clients/cli/connections.c:4887 ../src/devices/nm-device-vlan.c:433
 msgid "VLAN connection"
 msgstr "VLAN 接続"
 
-#: ../clients/cli/connections.c:4811
+#: ../clients/cli/connections.c:4889
 #, fuzzy
 msgid "Bond device"
 msgstr "Ethernet デバイス"
 
-#: ../clients/cli/connections.c:4813
+#: ../clients/cli/connections.c:4891
 #, fuzzy
 msgid "Team device"
 msgstr "TUN デバイスモード"
 
-#: ../clients/cli/connections.c:4815
+#: ../clients/cli/connections.c:4893
 #, fuzzy
 msgid "Team port"
 msgstr "team "
 
-#: ../clients/cli/connections.c:4817
+#: ../clients/cli/connections.c:4895
 #, fuzzy
 msgid "Bridge device"
 msgstr "Ethernet デバイス"
 
-#: ../clients/cli/connections.c:4819
+#: ../clients/cli/connections.c:4897
 #, fuzzy
 msgid "Bridge port"
 msgstr "ブリッジ"
 
-#: ../clients/cli/connections.c:4821 ../src/nm-manager.c:3824
+#: ../clients/cli/connections.c:4899 ../src/nm-manager.c:4080
 #, fuzzy
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:4823
+#: ../clients/cli/connections.c:4901
 #, fuzzy
 msgid "OLPC Mesh connection"
 msgstr "CDMA 接続"
 
-#: ../clients/cli/connections.c:4825 ../src/devices/adsl/nm-device-adsl.c:137
+#: ../clients/cli/connections.c:4903 ../src/devices/adsl/nm-device-adsl.c:137
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../clients/cli/connections.c:4827
+#: ../clients/cli/connections.c:4905
+msgid "MACsec connection"
+msgstr ""
+
+#: ../clients/cli/connections.c:4907
 #, fuzzy
 msgid "macvlan connection"
 msgstr "ボンド接続"
 
-#: ../clients/cli/connections.c:4829 ../src/devices/nm-device-vxlan.c:369
+#: ../clients/cli/connections.c:4909 ../src/devices/nm-device-vxlan.c:369
 msgid "VXLAN connection"
 msgstr "VXLAN 接続"
 
-#: ../clients/cli/connections.c:4831
+#: ../clients/cli/connections.c:4911
 #, fuzzy
 msgid "Tun device"
 msgstr "TUN デバイスモード"
 
-#: ../clients/cli/connections.c:4833
+#: ../clients/cli/connections.c:4913
 #, fuzzy
 msgid "IPv4 protocol"
 msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:4835
+#: ../clients/cli/connections.c:4915
 #, fuzzy
 msgid "IPv6 protocol"
 msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:4837
+#: ../clients/cli/connections.c:4917
 msgid "Proxy"
 msgstr ""
 
-#: ../clients/cli/connections.c:4920 ../clients/cli/utils.c:122
+#: ../clients/cli/connections.c:5004 ../clients/cli/utils.c:186
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "エラー: '%s' 引数の値が必要です。"
 
-#: ../clients/cli/connections.c:4926
+#: ../clients/cli/connections.c:5010
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:4998
+#: ../clients/cli/connections.c:5082
 #, fuzzy, c-format
 msgid "Error: '%s' argument is required."
 msgstr "エラー: 'タイプ' 引数が必要です。"
 
-#: ../clients/cli/connections.c:5968
+#: ../clients/cli/connections.c:6054
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
@@ -2552,7 +2476,7 @@ msgstr "['%s' 設定値]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6050
+#: ../clients/cli/connections.c:6136
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2585,7 +2509,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:6077
+#: ../clients/cli/connections.c:6163
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2604,7 +2528,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6084
+#: ../clients/cli/connections.c:6170
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2625,7 +2549,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6091
+#: ../clients/cli/connections.c:6177
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2640,7 +2564,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:6096
+#: ../clients/cli/connections.c:6182
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2653,7 +2577,7 @@ msgstr ""
 "プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-"
 "settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6101
+#: ../clients/cli/connections.c:6187
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2668,7 +2592,7 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6106
+#: ../clients/cli/connections.c:6192
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2693,7 +2617,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6115
+#: ../clients/cli/connections.c:6201
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2719,7 +2643,7 @@ msgstr ""
 "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
 "必要があります。\n"
 
-#: ../clients/cli/connections.c:6126
+#: ../clients/cli/connections.c:6212
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2740,7 +2664,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
 "は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:6133 ../clients/cli/connections.c:6292
+#: ../clients/cli/connections.c:6219 ../clients/cli/connections.c:6378
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -2749,7 +2673,7 @@ msgstr ""
 "back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:6136
+#: ../clients/cli/connections.c:6222
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -2758,7 +2682,7 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6139
+#: ../clients/cli/connections.c:6225
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2785,7 +2709,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6161 ../clients/cli/connections.c:6298
+#: ../clients/cli/connections.c:6247 ../clients/cli/connections.c:6384
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2798,8 +2722,8 @@ msgstr ""
 "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
 "求められます。\n"
 
-#: ../clients/cli/connections.c:6166 ../clients/cli/connections.c:6303
-#: ../clients/cli/connections.c:6723 ../clients/cli/connections.c:7675
+#: ../clients/cli/connections.c:6252 ../clients/cli/connections.c:6389
+#: ../clients/cli/connections.c:6809 ../clients/cli/connections.c:7761
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "不明なコマンド: '%s'\n"
@@ -2807,7 +2731,7 @@ msgstr "不明なコマンド: '%s'\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6232
+#: ../clients/cli/connections.c:6318
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2833,7 +2757,7 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:6257
+#: ../clients/cli/connections.c:6343
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2844,7 +2768,7 @@ msgstr ""
 "\n"
 "このプロパティに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:6261
+#: ../clients/cli/connections.c:6347
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2859,7 +2783,7 @@ msgstr ""
 "<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
 "プロパティー値が置換されます ('set' の場合と同じ)。\n"
 
-#: ../clients/cli/connections.c:6267
+#: ../clients/cli/connections.c:6353
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2870,7 +2794,7 @@ msgstr ""
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:6271
+#: ../clients/cli/connections.c:6357
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2905,7 +2829,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6282
+#: ../clients/cli/connections.c:6368
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2918,7 +2842,7 @@ msgstr ""
 "プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) "
 "man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6287
+#: ../clients/cli/connections.c:6373
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2932,7 +2856,7 @@ msgstr ""
 "プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させ"
 "ることもできます。\n"
 
-#: ../clients/cli/connections.c:6295
+#: ../clients/cli/connections.c:6381
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -2941,28 +2865,28 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6388
+#: ../clients/cli/connections.c:6474
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続のアクティベートに失敗しました。\n"
 
-#: ../clients/cli/connections.c:6472
+#: ../clients/cli/connections.c:6558
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "エラー: 設定 '%s' は必須のため削除できません。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6490
+#: ../clients/cli/connections.c:6576
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ タイプ: %s | 名前: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6526
+#: ../clients/cli/connections.c:6612
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "この接続は保存されません。本当に終了しますか? %s"
 
-#: ../clients/cli/connections.c:6575
+#: ../clients/cli/connections.c:6661
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2971,66 +2895,66 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
 "で「save」と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7021
-#: ../clients/cli/connections.c:7079
+#: ../clients/cli/connections.c:6686 ../clients/cli/connections.c:7107
+#: ../clients/cli/connections.c:7165
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティに対して許可されている値: %s\n"
 
-#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:7025
-#: ../clients/cli/connections.c:7083
+#: ../clients/cli/connections.c:6690 ../clients/cli/connections.c:7111
+#: ../clients/cli/connections.c:7169
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:6619 ../clients/cli/connections.c:6641
-#: ../clients/cli/connections.c:7029 ../clients/cli/connections.c:7088
+#: ../clients/cli/connections.c:6705 ../clients/cli/connections.c:6727
+#: ../clients/cli/connections.c:7115 ../clients/cli/connections.c:7174
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6635
+#: ../clients/cli/connections.c:6721
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:6664
+#: ../clients/cli/connections.c:6750
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:7180
-#: ../clients/cli/connections.c:7228
+#: ../clients/cli/connections.c:6756 ../clients/cli/connections.c:7266
+#: ../clients/cli/connections.c:7314
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6691
+#: ../clients/cli/connections.c:6777
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:6796
+#: ../clients/cli/connections.c:6882
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:6808
+#: ../clients/cli/connections.c:6894
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:6911
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "使用可能なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:6833
+#: ../clients/cli/connections.c:6919
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティ %s\n"
 
-#: ../clients/cli/connections.c:6874
+#: ../clients/cli/connections.c:6960
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3041,12 +2965,12 @@ msgstr ""
 "ベートされる可能性があります。\n"
 "本当に保存しますか? %s"
 
-#: ../clients/cli/connections.c:6963
+#: ../clients/cli/connections.c:7049
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:6991
+#: ../clients/cli/connections.c:7077
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3055,409 +2979,409 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。「save」と入力"
 "すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:7033 ../clients/cli/connections.c:7273
+#: ../clients/cli/connections.c:7119 ../clients/cli/connections.c:7359
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません; 有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:7034
+#: ../clients/cli/connections.c:7120
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
 "ください。\n"
 
-#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7207
-#: ../clients/cli/connections.c:7295
+#: ../clients/cli/connections.c:7134 ../clients/cli/connections.c:7293
+#: ../clients/cli/connections.c:7381
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7058
+#: ../clients/cli/connections.c:7144
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティ用の設定がありません\n"
 
-#: ../clients/cli/connections.c:7065
+#: ../clients/cli/connections.c:7151
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:7118
+#: ../clients/cli/connections.c:7204
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:7141
+#: ../clients/cli/connections.c:7227
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティになります: %s\n"
 
-#: ../clients/cli/connections.c:7185
+#: ../clients/cli/connections.c:7271
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7204
+#: ../clients/cli/connections.c:7290
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:7249
+#: ../clients/cli/connections.c:7335
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティ、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7274
+#: ../clients/cli/connections.c:7360
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
 "用してください\n"
 
-#: ../clients/cli/connections.c:7323
+#: ../clients/cli/connections.c:7409
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7355
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7360
+#: ../clients/cli/connections.c:7446
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:7388
+#: ../clients/cli/connections.c:7474
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティ: %s%s\n"
 
-#: ../clients/cli/connections.c:7390
+#: ../clients/cli/connections.c:7476
 msgid ", neither a valid setting name"
 msgstr "有効な設定名でもありません。"
 
-#: ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:7493
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効な検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7415
+#: ../clients/cli/connections.c:7501
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:7430
+#: ../clients/cli/connections.c:7516
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:7433
+#: ../clients/cli/connections.c:7519
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的に修正できません\n"
 
-#: ../clients/cli/connections.c:7450
+#: ../clients/cli/connections.c:7536
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7482
+#: ../clients/cli/connections.c:7568
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7489
+#: ../clients/cli/connections.c:7575
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:7490
+#: ../clients/cli/connections.c:7576
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) が正常に更新されました。\n"
 
-#: ../clients/cli/connections.c:7522
+#: ../clients/cli/connections.c:7608
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7523
+#: ../clients/cli/connections.c:7609
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:7524
+#: ../clients/cli/connections.c:7610
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
 
-#: ../clients/cli/connections.c:7546
+#: ../clients/cli/connections.c:7632
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:7550
+#: ../clients/cli/connections.c:7636
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:7560
+#: ../clients/cli/connections.c:7646
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:7569
+#: ../clients/cli/connections.c:7655
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7575
+#: ../clients/cli/connections.c:7661
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:7611
+#: ../clients/cli/connections.c:7697
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7619
+#: ../clients/cli/connections.c:7705
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7627
+#: ../clients/cli/connections.c:7713
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7636
+#: ../clients/cli/connections.c:7722
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "エラー: 不正な色: %s\n"
 
-#: ../clients/cli/connections.c:7650
+#: ../clients/cli/connections.c:7736
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:7660
+#: ../clients/cli/connections.c:7746
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] が許可されています\n"
 
-#: ../clients/cli/connections.c:7877
+#: ../clients/cli/connections.c:7975
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
 
-#: ../clients/cli/connections.c:7889 ../clients/cli/connections.c:8050
+#: ../clients/cli/connections.c:7990 ../clients/cli/connections.c:8156
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:7907
+#: ../clients/cli/connections.c:8008
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています;  'タイプ' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:7910
+#: ../clients/cli/connections.c:8011
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています; 'con 名' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:7924
+#: ../clients/cli/connections.c:8031
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:7926
+#: ../clients/cli/connections.c:8033
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:7965
+#: ../clients/cli/connections.c:8072
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:7968
+#: ../clients/cli/connections.c:8075
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:7970
+#: ../clients/cli/connections.c:8077
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:7972
+#: ../clients/cli/connections.c:8079
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:7974
+#: ../clients/cli/connections.c:8081
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:8009
+#: ../clients/cli/connections.c:8116
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8016
+#: ../clients/cli/connections.c:8123
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#: ../clients/cli/connections.c:8098
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
 
-#: ../clients/cli/connections.c:8162
+#: ../clients/cli/connections.c:8270
 msgid "New connection name: "
 msgstr "新規の接続名:"
 
-#: ../clients/cli/connections.c:8164
+#: ../clients/cli/connections.c:8272
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:8170 ../clients/cli/connections.c:8653
+#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8798
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー: 不明な追加の引数: '%s'。"
 
-#: ../clients/cli/connections.c:8219
+#: ../clients/cli/connections.c:8329
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部の接続が削除されていません。"
 
-#: ../clients/cli/connections.c:8220
+#: ../clients/cli/connections.c:8330
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続の削除に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8277 ../clients/cli/connections.c:8400
+#: ../clients/cli/connections.c:8391 ../clients/cli/connections.c:8516
 #, fuzzy, c-format
 msgid "Error: %s.\n"
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8401
+#: ../clients/cli/connections.c:8392 ../clients/cli/connections.c:8517
 #, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: 一部の接続が見つかりません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8320
+#: ../clients/cli/connections.c:8435
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:8332
+#: ../clients/cli/connections.c:8447
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイルが変更されました\n"
 
-#: ../clients/cli/connections.c:8358
+#: ../clients/cli/connections.c:8473
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイルが作成されました\n"
 
-#: ../clients/cli/connections.c:8367
+#: ../clients/cli/connections.c:8482
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイルが削除されました\n"
 
-#: ../clients/cli/connections.c:8428
+#: ../clients/cli/connections.c:8545
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: 接続のリロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8578
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続のロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8468
+#: ../clients/cli/connections.c:8586
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:8477
+#: ../clients/cli/connections.c:8595
 msgid "File to import: "
 msgstr "インポートするファイル:"
 
-#: ../clients/cli/connections.c:8501
+#: ../clients/cli/connections.c:8642
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数がありません。"
 
-#: ../clients/cli/connections.c:8524
+#: ../clients/cli/connections.c:8667
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8537
+#: ../clients/cli/connections.c:8682
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8539
+#: ../clients/cli/connections.c:8684
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明なパラメーター: %s"
 
-#: ../clients/cli/connections.c:8552
+#: ../clients/cli/connections.c:8696
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "エラー: 'タイプ' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8557
+#: ../clients/cli/connections.c:8701
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8564
+#: ../clients/cli/connections.c:8708
 #, fuzzy, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8572 ../clients/cli/connections.c:8669
+#: ../clients/cli/connections.c:8716 ../clients/cli/connections.c:8817
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8580
+#: ../clients/cli/connections.c:8724
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' のインポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8650
+#: ../clients/cli/connections.c:8804
 msgid "Output file name: "
 msgstr "出力ファイル名:"
 
-#: ../clients/cli/connections.c:8660
+#: ../clients/cli/connections.c:8808
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続は VPN ではありません。"
 
-#: ../clients/cli/connections.c:8681
+#: ../clients/cli/connections.c:8829
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
 
-#: ../clients/cli/connections.c:8690
+#: ../clients/cli/connections.c:8838
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8701
+#: ../clients/cli/connections.c:8849
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
@@ -3593,298 +3517,303 @@ msgstr "キャリア検出"
 msgid "SPEED"
 msgstr "速度"
 
+#. 3
+#: ../clients/cli/devices.c:104
+msgid "SRIOV"
+msgstr ""
+
 #. 0
-#: ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:113
 msgid "CARRIER"
 msgstr "キャリア"
 
 #. 1
-#: ../clients/cli/devices.c:113
+#: ../clients/cli/devices.c:114
 msgid "S390-SUBCHANNELS"
 msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:827
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:828
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../clients/cli/devices.c:123
+#: ../clients/cli/devices.c:124
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:835
+#: ../clients/cli/devices.c:125 ../clients/cli/devices.c:836
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../clients/cli/devices.c:125
+#: ../clients/cli/devices.c:126
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../clients/cli/devices.c:126
+#: ../clients/cli/devices.c:127
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:128 ../clients/cli/devices.c:240
 msgid "AP"
 msgstr "AP"
 
 #. 6
-#: ../clients/cli/devices.c:128
+#: ../clients/cli/devices.c:129
 msgid "ADHOC"
 msgstr "アドホック"
 
 #. 7
-#: ../clients/cli/devices.c:129
+#: ../clients/cli/devices.c:130
 msgid "2GHZ"
 msgstr "2GHZ"
 
 #. 8
-#: ../clients/cli/devices.c:130
+#: ../clients/cli/devices.c:131
 msgid "5GHZ"
 msgstr "5GHZ"
 
 #. 0
-#: ../clients/cli/devices.c:139
+#: ../clients/cli/devices.c:140
 msgid "CTR-FREQ"
 msgstr "中心周波数"
 
 #. 1
-#: ../clients/cli/devices.c:140
+#: ../clients/cli/devices.c:141
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../clients/cli/devices.c:141
+#: ../clients/cli/devices.c:142
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../clients/cli/devices.c:142
+#: ../clients/cli/devices.c:143
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../clients/cli/devices.c:143
+#: ../clients/cli/devices.c:144
 msgid "BSID"
 msgstr "BSID"
 
 #. 1
-#: ../clients/cli/devices.c:153
+#: ../clients/cli/devices.c:154
 msgid "SSID-HEX"
 msgstr "SSID-HEX"
 
 #. 2
-#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:358
+#: ../clients/cli/devices.c:155 ../clients/tui/nmt-page-wifi.c:358
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 3
-#: ../clients/cli/devices.c:155
+#: ../clients/cli/devices.c:156
 msgid "MODE"
 msgstr "モード"
 
 #. 4
-#: ../clients/cli/devices.c:156
+#: ../clients/cli/devices.c:157
 msgid "CHAN"
 msgstr "CHAN"
 
 #. 5
-#: ../clients/cli/devices.c:157
+#: ../clients/cli/devices.c:158
 msgid "FREQ"
 msgstr "周波数"
 
 #. 6
-#: ../clients/cli/devices.c:158
+#: ../clients/cli/devices.c:159
 msgid "RATE"
 msgstr "レート"
 
 #. 7
 #. 1
-#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179
+#: ../clients/cli/devices.c:160 ../clients/cli/devices.c:180
 msgid "SIGNAL"
 msgstr "信号"
 
 #. 8
-#: ../clients/cli/devices.c:160
+#: ../clients/cli/devices.c:161
 msgid "BARS"
 msgstr "バー"
 
 #. 9
-#: ../clients/cli/devices.c:161
+#: ../clients/cli/devices.c:162
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. 10
-#: ../clients/cli/devices.c:162
+#: ../clients/cli/devices.c:163
 msgid "WPA-FLAGS"
 msgstr "WPA-フラグ"
 
 #. 11
-#: ../clients/cli/devices.c:163
+#: ../clients/cli/devices.c:164
 msgid "RSN-FLAGS"
 msgstr "RSN-フラグ"
 
 #. 14
-#: ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:167
 msgid "*"
 msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:242
+#: ../clients/cli/devices.c:179 ../clients/cli/devices.c:243
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:194 ../clients/cli/devices.c:203
 msgid "SLAVES"
 msgstr "スレーブ"
 
 #. 1
-#: ../clients/cli/devices.c:203
+#: ../clients/cli/devices.c:204
 msgid "CONFIG"
 msgstr ""
 
 #. 0
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:213
 msgid "PARENT"
 msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:213
+#: ../clients/cli/devices.c:214
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:222 ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:223 ../clients/cli/devices.c:238
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:239
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 3
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:241
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:242
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-プロパティ"
 
 #. 10
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "ボンド"
 
 #. 11
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "team"
 
 #. 12
-#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:250 ../clients/tui/nmt-page-bridge.c:81
 msgid "BRIDGE"
 msgstr "ブリッジ"
 
 #. 13
-#: ../clients/cli/devices.c:250 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1897
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1681
+#: ../clients/cli/devices.c:251 ../clients/tui/nm-editor-utils.c:217
+#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1937
+#: ../libnm-glib/nm-device.c:1841 ../libnm-util/nm-connection.c:1632
+#: ../libnm/nm-device.c:1637
 msgid "VLAN"
 msgstr "VLAN"
 
 #. 14
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:252
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:252
+#: ../clients/cli/devices.c:253
 msgid "CONNECTIONS"
 msgstr "接続"
 
 #. 1
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID"
 msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID"
 msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:267
 msgid "PORT-DESCRIPTION"
 msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:268
 msgid "SYSTEM-NAME"
 msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:269
 msgid "SYSTEM-DESCRIPTION"
 msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:270
 msgid "SYSTEM-CAPABILITIES"
 msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:271
 msgid "IEEE-802-1-PVID"
 msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:272
 msgid "IEEE-802-1-PPVID"
 msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:273
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:274
 msgid "IEEE-802-1-VID"
 msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:275
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:276
 msgid "DESTINATION"
 msgstr "DESTINATION"
 
 #. 13
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:277
 msgid "CHASSIS-ID-TYPE"
 msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:277
+#: ../clients/cli/devices.c:278
 msgid "PORT-ID-TYPE"
 msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:294
+#: ../clients/cli/devices.c:295
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -3961,7 +3890,7 @@ msgstr ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:317
+#: ../clients/cli/devices.c:318
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3992,7 +3921,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:332
+#: ../clients/cli/devices.c:333
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -4011,7 +3940,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:343
+#: ../clients/cli/devices.c:344
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -4033,7 +3962,7 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:355
+#: ../clients/cli/devices.c:356
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -4052,7 +3981,7 @@ msgstr ""
 "でデバイスの更新を試行します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:366
+#: ../clients/cli/devices.c:367
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -4095,7 +4024,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/devices.c:386
+#: ../clients/cli/devices.c:387
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4117,7 +4046,7 @@ msgstr ""
 "それ以降の接続が自動アクティベートされることが防がれます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:398
+#: ../clients/cli/devices.c:399
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4140,7 +4069,7 @@ msgstr ""
 "コマンドで削除できません。\n"
 "\n"
 
-#: ../clients/cli/devices.c:411
+#: ../clients/cli/devices.c:412
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4163,7 +4092,7 @@ msgstr ""
 "デバイスプロパティーを変更します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:424
+#: ../clients/cli/devices.c:425
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4185,7 +4114,7 @@ msgstr ""
 "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:436
+#: ../clients/cli/devices.c:437
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -4294,7 +4223,7 @@ msgstr ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 
-#: ../clients/cli/devices.c:483
+#: ../clients/cli/devices.c:484
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -4315,113 +4244,113 @@ msgstr ""
 "特定のインターフェースの近接デバイスを一覧表示できます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:584
+#: ../clients/cli/devices.c:585
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:607
+#: ../clients/cli/devices.c:608
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' が重複しています。\n"
 
-#: ../clients/cli/devices.c:610
+#: ../clients/cli/devices.c:611
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:611
+#: ../clients/cli/devices.c:612
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部のデバイスが見つかりません。"
 
-#: ../clients/cli/devices.c:640
+#: ../clients/cli/devices.c:641
 #, fuzzy
 msgid "No interface specified"
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:659
+#: ../clients/cli/devices.c:660
 #, fuzzy, c-format
 msgid "Device '%s' not found"
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:745 ../clients/cli/devices.c:897
+#: ../clients/cli/devices.c:746 ../clients/cli/devices.c:898
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../clients/cli/devices.c:815
+#: ../clients/cli/devices.c:816
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:816
+#: ../clients/cli/devices.c:817
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:831
+#: ../clients/cli/devices.c:832
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:840
+#: ../clients/cli/devices.c:841
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:857
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:857
+#: ../clients/cli/devices.c:858
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:858
+#: ../clients/cli/devices.c:859
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:1082
+#: ../clients/cli/devices.c:1083
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:1094
+#: ../clients/cli/devices.c:1095
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1149
+#: ../clients/cli/devices.c:1149 ../clients/cli/devices.c:1152
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1190
+#: ../clients/cli/devices.c:1193
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1281
+#: ../clients/cli/devices.c:1285
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/devices.c:1281
+#: ../clients/cli/devices.c:1285
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/devices.c:1519
+#: ../clients/cli/devices.c:1518
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1525
+#: ../clients/cli/devices.c:1524
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2013
-#: ../clients/cli/devices.c:3741
+#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2015
+#: ../clients/cli/devices.c:3781
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:461
+#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:455
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
@@ -4483,117 +4412,118 @@ msgstr ""
 msgid "Device '%s' has been connected.\n"
 msgstr "デバイス '%s'  は接続されています。\n"
 
-#: ../clients/cli/devices.c:1845
+#: ../clients/cli/devices.c:1846
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:1917 ../clients/cli/devices.c:1932
-#: ../clients/cli/devices.c:2160
+#: ../clients/cli/devices.c:1918 ../clients/cli/devices.c:1933
+#: ../clients/cli/devices.c:2163
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:1920
+#: ../clients/cli/devices.c:1921
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:1979 ../clients/cli/devices.c:2048
+#: ../clients/cli/devices.c:1980 ../clients/cli/devices.c:2050
 #, fuzzy, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:1989 ../clients/cli/devices.c:2057
+#: ../clients/cli/devices.c:1990 ../clients/cli/devices.c:2059
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
 
-#: ../clients/cli/devices.c:2082
+#: ../clients/cli/devices.c:2084
 #, fuzzy, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2145
+#: ../clients/cli/devices.c:2148
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部のデバイスが切断されませんでした。"
 
-#: ../clients/cli/devices.c:2146
+#: ../clients/cli/devices.c:2149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2223
+#: ../clients/cli/devices.c:2227
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部のデバイスが削除されませんでした。"
 
-#: ../clients/cli/devices.c:2224
+#: ../clients/cli/devices.c:2228
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2308
+#: ../clients/cli/devices.c:2312
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティーが指定されていません。"
 
-#: ../clients/cli/devices.c:2321 ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2327 ../clients/cli/devices.c:2344
+#: ../clients/cli/general.c:664 ../clients/cli/general.c:676
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2327
+#: ../clients/cli/devices.c:2333
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2342
+#: ../clients/cli/devices.c:2350
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "エラー: '自動接続': %s。"
 
-#: ../clients/cli/devices.c:2350
+#: ../clients/cli/devices.c:2358 ../clients/cli/general.c:690
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' が不明です。"
 
-#: ../clients/cli/devices.c:2400
+#: ../clients/cli/devices.c:2408
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2426
+#: ../clients/cli/devices.c:2434
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デバイスが作成されました\n"
 
-#: ../clients/cli/devices.c:2433
+#: ../clients/cli/devices.c:2441
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デバイスが削除されました\n"
 
-#: ../clients/cli/devices.c:2630
+#: ../clients/cli/devices.c:2639
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2674
+#: ../clients/cli/devices.c:2687
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:2685
+#: ../clients/cli/devices.c:2698
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2788
+#: ../clients/cli/devices.c:2719 ../clients/cli/devices.c:2801
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:2732
+#: ../clients/cli/devices.c:2745
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4602,27 +4532,27 @@ msgstr ""
 "エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
 "NetworkManager Wi-Fi プラグインを確認してください。"
 
-#: ../clients/cli/devices.c:2736 ../clients/cli/devices.c:2998
-#: ../clients/cli/devices.c:3421 ../clients/cli/devices.c:3576
+#: ../clients/cli/devices.c:2749 ../clients/cli/devices.c:3026
+#: ../clients/cli/devices.c:3461 ../clients/cli/devices.c:3620
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:2863
+#: ../clients/cli/devices.c:2876
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:2868
+#: ../clients/cli/devices.c:2881
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:2900
+#: ../clients/cli/devices.c:2917
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:2926
+#: ../clients/cli/devices.c:2947
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4630,120 +4560,120 @@ msgstr ""
 "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
 "てください。"
 
-#: ../clients/cli/devices.c:2948 ../clients/cli/devices.c:2963
+#: ../clients/cli/devices.c:2974 ../clients/cli/devices.c:2992
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:2981
+#: ../clients/cli/devices.c:3009
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:2987
+#: ../clients/cli/devices.c:3015
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:3000 ../clients/cli/devices.c:3423
-#: ../clients/cli/devices.c:3578
+#: ../clients/cli/devices.c:3028 ../clients/cli/devices.c:3463
+#: ../clients/cli/devices.c:3622
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3020
+#: ../clients/cli/devices.c:3048
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
 
-#: ../clients/cli/devices.c:3047
+#: ../clients/cli/devices.c:3075
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3049
+#: ../clients/cli/devices.c:3077
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3091
+#: ../clients/cli/devices.c:3119
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 "警告: '%s' は非表示の AP の SSID である必要がありますが、BSSID のようです。\n"
 
-#: ../clients/cli/devices.c:3105
+#: ../clients/cli/devices.c:3133
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3254
+#: ../clients/cli/devices.c:3282
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' は有効な WPA PSK ではありません"
 
-#: ../clients/cli/devices.c:3271
+#: ../clients/cli/devices.c:3299
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要"
 "があります)"
 
-#: ../clients/cli/devices.c:3287
+#: ../clients/cli/devices.c:3315
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットスポットのパスワード: %s\n"
 
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:3386
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid が長すぎます。"
 
-#: ../clients/cli/devices.c:3363
+#: ../clients/cli/devices.c:3400
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
 
-#: ../clients/cli/devices.c:3384
+#: ../clients/cli/devices.c:3425
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3405
+#: ../clients/cli/devices.c:3445
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: チャネルにはバンドも必要です。"
 
-#: ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:3450
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: チャンネル '%s' はバンド '%s' に対して有効ではありません。"
 
-#: ../clients/cli/devices.c:3434
+#: ../clients/cli/devices.c:3474
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "エラー: デバイス '%s' は AP またはアドホックモードのいずれもサポートしませ"
 "ん。"
 
-#: ../clients/cli/devices.c:3468
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効なパスワード: %s。"
 
-#: ../clients/cli/devices.c:3542
+#: ../clients/cli/devices.c:3583
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返すことはできません。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3651
+#: ../clients/cli/devices.c:3688
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デバイス"
 
-#: ../clients/cli/devices.c:3759
+#: ../clients/cli/devices.c:3798
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
@@ -5101,6 +5031,10 @@ msgstr "接続完了 (サイトのみ)"
 msgid "disconnecting"
 msgstr "切断中"
 
+#: ../clients/cli/general.c:280
+msgid "none"
+msgstr "なし"
+
 #: ../clients/cli/general.c:282
 msgid "portal"
 msgstr "ポータル"
@@ -5146,177 +5080,178 @@ msgstr "有効"
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:450
+#: ../clients/cli/general.c:444
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:491
+#: ../clients/cli/general.c:485
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:497
+#: ../clients/cli/general.c:491
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:607
+#: ../clients/cli/general.c:595
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:621
+#: ../clients/cli/general.c:609
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:670
+#: ../clients/cli/general.c:700
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギングの設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:687
+#: ../clients/cli/general.c:717
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:753
+#: ../clients/cli/general.c:786
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "エラー: '--fields' の値 '%s' はここでは無効です (許可フィールド: %s)"
 
-#: ../clients/cli/general.c:778
+#: ../clients/cli/general.c:811
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:823 ../clients/cli/general.c:835
+#: ../clients/cli/general.c:859 ../clients/cli/general.c:871
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:838
+#: ../clients/cli/general.c:874
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "エラー: 'networking' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:851
+#: ../clients/cli/general.c:888
 msgid "Networking"
 msgstr "ネットワーキング"
 
-#: ../clients/cli/general.c:889
+#. no argument, show all radio switches
+#: ../clients/cli/general.c:923
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:918
+#: ../clients/cli/general.c:953
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:944
+#: ../clients/cli/general.c:980
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:991
+#: ../clients/cli/general.c:1029
 msgid "NetworkManager has started"
 msgstr "NetworkManager  が起動されました"
 
-#: ../clients/cli/general.c:991
+#: ../clients/cli/general.c:1029
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager が停止しました"
 
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1040
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト名が '%s' に設定されました\n"
 
-#: ../clients/cli/general.c:1017
+#: ../clients/cli/general.c:1055
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' はプライマリー接続です\n"
 
-#: ../clients/cli/general.c:1019
+#: ../clients/cli/general.c:1057
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続がありません\n"
 
-#: ../clients/cli/general.c:1031
+#: ../clients/cli/general.c:1069
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性は '%s' です\n"
 
-#: ../clients/cli/general.c:1044
+#: ../clients/cli/general.c:1082
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager の状態は '%s' です\n"
 
-#: ../clients/cli/general.c:1065
+#: ../clients/cli/general.c:1103
 #, fuzzy
 msgid "connection available"
 msgstr "接続に失敗"
 
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1105
 #, fuzzy
 msgid "connections available"
 msgstr "接続に失敗"
 
-#: ../clients/cli/general.c:1085
+#: ../clients/cli/general.c:1123
 #, fuzzy
 msgid "autoconnect"
 msgstr "接続済み"
 
-#: ../clients/cli/general.c:1087
+#: ../clients/cli/general.c:1125
 #, fuzzy
 msgid "fw missing"
 msgstr "データがありません"
 
-#: ../clients/cli/general.c:1092
+#: ../clients/cli/general.c:1130
 #, fuzzy
 msgid "plugin missing"
 msgstr "データがありません"
 
-#: ../clients/cli/general.c:1097
+#: ../clients/cli/general.c:1135
 msgid "sw"
 msgstr ""
 
-#: ../clients/cli/general.c:1099
+#: ../clients/cli/general.c:1137
 #, fuzzy
 msgid "hw"
 msgstr "表示する"
 
-#: ../clients/cli/general.c:1104
+#: ../clients/cli/general.c:1142
 msgid "iface"
 msgstr ""
 
-#: ../clients/cli/general.c:1107
+#: ../clients/cli/general.c:1145
 #, fuzzy
 msgid "port"
 msgstr "ポータル"
 
-#: ../clients/cli/general.c:1110
+#: ../clients/cli/general.c:1148
 msgid "mtu"
 msgstr ""
 
-#: ../clients/cli/general.c:1127
+#: ../clients/cli/general.c:1165
 #, fuzzy
 msgid "master"
 msgstr "マスター: "
 
-#: ../clients/cli/general.c:1133
+#: ../clients/cli/general.c:1171
 #, fuzzy
 msgid "ip4 default"
 msgstr "デフォルト"
 
-#: ../clients/cli/general.c:1135
+#: ../clients/cli/general.c:1173
 #, fuzzy
 msgid "ip6 default"
 msgstr "デフォルト"
 
-#: ../clients/cli/general.c:1213
+#: ../clients/cli/general.c:1253
 #, fuzzy, c-format
 msgid "%s VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/cli/general.c:1283
+#: ../clients/cli/general.c:1323
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -5327,35 +5262,37 @@ msgid ""
 "details.\n"
 msgstr ""
 
-#: ../clients/cli/general.c:1302
+#: ../clients/cli/general.c:1344
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
 
-#: ../clients/cli/general.c:1314
+#: ../clients/cli/general.c:1356
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager が実行されていません (待機中)\n"
 
-#: ../clients/cli/nmcli.c:181
+#: ../clients/cli/nmcli.c:171
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli [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"
-"  -c[olors] auto|yes|no                      whether to use colors in "
+"  -t[erse]                                       terse output\n"
+"  -p[retty]                                      pretty output\n"
+"  -m[ode] tabular|multiline                      output mode\n"
+"  -c[olors] auto|yes|no                          whether to use colors in "
 "output\n"
-"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\n"
-"  -a[sk]                                     ask for missing parameters\n"
-"  -s[how-secrets]                            allow displaying passwords\n"
-"  -w[ait] <seconds>                          set timeout waiting for "
+"  -f[ields] <field1,field2,...>|all|common       specify fields to output\n"
+"  -g[et-values] <field1,field2,...>|all|common   shortcut for -m tabular -t -"
+"f\n"
+"  -e[scape] yes|no                               escape columns separators "
+"in values\n"
+"  -a[sk]                                         ask for missing parameters\n"
+"  -s[how-secrets]                                allow displaying passwords\n"
+"  -w[ait] <seconds>                              set timeout waiting for "
 "finishing operations\n"
-"  -v[ersion]                                 show program version\n"
-"  -h[elp]                                    print this help\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"
@@ -5398,66 +5335,66 @@ msgstr ""
 "  m[onitor]       NetworkManager の変更を監視\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:258
+#: ../clients/cli/nmcli.c:249
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:263
+#: ../clients/cli/nmcli.c:254
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:262
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:267
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:285 ../clients/cli/nmcli.c:302
-#: ../clients/cli/nmcli.c:321 ../clients/cli/nmcli.c:354
+#: ../clients/cli/nmcli.c:278 ../clients/cli/nmcli.c:297
+#: ../clients/cli/nmcli.c:318 ../clients/cli/nmcli.c:369
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/nmcli.c:296 ../clients/cli/nmcli.c:315
-#: ../clients/cli/nmcli.c:332
+#: ../clients/cli/nmcli.c:289 ../clients/cli/nmcli.c:310
+#: ../clients/cli/nmcli.c:329
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:338
+#: ../clients/cli/nmcli.c:337 ../clients/cli/nmcli.c:348
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../clients/cli/nmcli.c:359
+#: ../clients/cli/nmcli.c:374
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "エラー: '%s' は '%s' オプションの有効なタイムアウトではありません。"
 
-#: ../clients/cli/nmcli.c:367
+#: ../clients/cli/nmcli.c:382
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../clients/cli/nmcli.c:374
+#: ../clients/cli/nmcli.c:389
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:419 ../clients/cli/nmcli.c:426
+#: ../clients/cli/nmcli.c:433 ../clients/cli/nmcli.c:440
 #, fuzzy, c-format
 msgid "Error: nmcli terminated by signal %s (%d)\n"
 msgstr ""
 "\n"
 "Error: nmcli がシグナル %s (%d) で終了しました\n"
 
-#: ../clients/cli/nmcli.c:524
+#: ../clients/cli/nmcli.c:538
 msgid "Success"
 msgstr "成功"
 
@@ -5476,405 +5413,197 @@ msgstr "認証エラー: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
 
-#: ../clients/cli/settings.c:820
+#: ../clients/cli/settings.c:874
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/cli/settings.c:822
+#: ../clients/cli/settings.c:876
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/cli/settings.c:825 ../clients/cli/settings.c:911
+#: ../clients/cli/settings.c:879 ../clients/cli/settings.c:968
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:854
+#: ../clients/cli/settings.c:911
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:860
+#: ../clients/cli/settings.c:917
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/cli/settings.c:862
+#: ../clients/cli/settings.c:919
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/cli/settings.c:864
+#: ../clients/cli/settings.c:921
 msgid "LOOSE_BINDING, "
 msgstr "結合を緩める、"
 
-#: ../clients/cli/settings.c:866
+#: ../clients/cli/settings.c:923
 msgid "MVRP, "
 msgstr "MVRP、"
 
-#: ../clients/cli/settings.c:905
+#: ../clients/cli/settings.c:962
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (無効)"
 
-#: ../clients/cli/settings.c:907
+#: ../clients/cli/settings.c:964
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (有効、パブリック IP 優先)"
 
-#: ../clients/cli/settings.c:909
+#: ../clients/cli/settings.c:966
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (有効、テンポラリ IP を優先)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:981
 #, c-format
 msgid "%d (no)"
 msgstr "%d (no)"
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:983
 #, c-format
 msgid "%d (yes)"
 msgstr "%d (yes)"
 
-#: ../clients/cli/settings.c:929 ../clients/cli/settings.c:1340
-#: ../clients/cli/settings.c:1692
+#: ../clients/cli/settings.c:986 ../clients/cli/settings.c:2484
+#: ../clients/cli/settings.c:3609
 #, c-format
 msgid "%d (default)"
 msgstr "%d (default)"
 
-#: ../clients/cli/settings.c:942
+#: ../clients/cli/settings.c:999
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:948
+#: ../clients/cli/settings.c:1005
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/cli/settings.c:950
+#: ../clients/cli/settings.c:1007
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/cli/settings.c:952
+#: ../clients/cli/settings.c:1009
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/cli/settings.c:1001 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:1058 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1093 ../clients/cli/settings.c:1150
-#: ../clients/cli/settings.c:1191 ../clients/cli/settings.c:1225
-#: ../clients/cli/settings.c:8301
-msgid "<hidden>"
-msgstr "<hidden>"
-
-#: ../clients/cli/settings.c:1342
-#, fuzzy, c-format
-msgid "%d (forever)"
-msgstr "%d (no)"
-
-#: ../clients/cli/settings.c:1389
-msgid "0 (disabled)"
-msgstr "0 (無効)"
-
-#: ../clients/cli/settings.c:1395
-msgid "enabled, "
-msgstr "有効、"
-
-#: ../clients/cli/settings.c:1397
-msgid "advertise, "
-msgstr "公表、"
-
-#: ../clients/cli/settings.c:1399
-msgid "willing, "
-msgstr "用意がある、"
-
-#: ../clients/cli/settings.c:1427
-msgid "-1 (unset)"
-msgstr "-1 (未設定)"
-
-#: ../clients/cli/settings.c:1559 ../clients/cli/settings.c:1887
-#: ../clients/cli/settings.c:2028
-msgid "auto"
-msgstr "自動"
-
-#: ../clients/cli/settings.c:1572 ../clients/cli/settings.c:2059
-msgid "default"
-msgstr "デフォルト"
-
-#: ../clients/cli/settings.c:1694
-#, c-format
-msgid "%d (off)"
-msgstr "%d (off)"
-
-#: ../clients/cli/settings.c:1933
-#, c-format
-msgid ""
-"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
-"'none'"
-msgstr ""
-"無効なオプション '%s' です。[%s]、'ignore'、'default'、または 'none' の組み合"
-"わせを使用してください"
-
-#: ../clients/cli/settings.c:1944
-msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr "'default' と 'ignore' は他のフラグと使用できません"
-
-#: ../clients/cli/settings.c:1980
+#: ../clients/cli/settings.c:1124
 #, c-format
-msgid "invalid mode '%s', use one of %s"
-msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
-
-#: ../clients/cli/settings.c:2063
-#, c-format
-msgid "always"
-msgstr "always"
+msgid "'%s' is not valid; use <option>=<value>"
+msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/cli/settings.c:2163 ../clients/cli/settings.c:3618
-#: ../clients/cli/settings.c:4803 ../clients/cli/settings.c:5307
-#: ../libnm-core/nm-keyfile-reader.c:579
+#: ../clients/cli/settings.c:1158
 #, c-format
-msgid "invalid option '%s', use one of [%s]"
-msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
+msgid "index '%s' is not valid"
+msgstr "インデックス '%s' は無効です"
 
-#: ../clients/cli/settings.c:2236
-#, fuzzy, c-format
-msgid "invalid method '%s', use one of %s"
-msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
+#: ../clients/cli/settings.c:1163 ../clients/cli/settings.c:1188
+msgid "no item to remove"
+msgstr "削除するアイテムがありません"
 
-#: ../clients/cli/settings.c:2332
+#: ../clients/cli/settings.c:1167 ../clients/cli/settings.c:1192
 #, c-format
-msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "'%s' を '%s' に設定しますか? [yes]: "
+msgid "index '%d' is not in range <0-%d>"
+msgstr "インデックス '%d' は範囲内にありません <0-%d>"
 
-#: ../clients/cli/settings.c:2334
+#: ../clients/cli/settings.c:1207
 #, c-format
-msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "'%s' も消去しますか? [yes]: "
+msgid "invalid option '%s'"
+msgstr "無効なオプション '%s'"
 
-#: ../clients/cli/settings.c:2510
-#, c-format
-msgid ""
-"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
-"警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視さ"
-"れることがあります\n"
+#: ../clients/cli/settings.c:1209
+msgid "missing option"
+msgstr "足りないオプション"
 
-#: ../clients/cli/settings.c:2529
+#: ../clients/cli/settings.c:1243
 #, c-format
-msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
-"警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
-
-#: ../clients/cli/settings.c:2531
-msgid "Do you want to remove them? [yes] "
-msgstr "削除しますか? [yes] "
+msgid "'%s' is not a valid MAC"
+msgstr "'%s' は有効な MAC ではありません"
 
-#: ../clients/cli/settings.c:2677 ../clients/cli/settings.c:3072
-#: ../clients/cli/settings.c:5508
+#: ../clients/cli/settings.c:1273 ../clients/cli/settings.c:1533
+#: ../clients/cli/settings.c:5650
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../clients/cli/settings.c:2700
+#: ../clients/cli/settings.c:1296
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2722
+#: ../clients/cli/settings.c:1318
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "'%lld' は有効ではありません。<%lld-%lld> を使用してください"
 
-#: ../clients/cli/settings.c:2744
+#: ../clients/cli/settings.c:1340
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "'%u' は有効ではありません。<%u-%u> を使用してください"
 
-#: ../clients/cli/settings.c:2783
+#: ../clients/cli/settings.c:1379
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
 
-#: ../clients/cli/settings.c:2850
-#, c-format
-msgid "'%s' is not valid; use <option>=<value>"
-msgstr "'%s' は無効です; <option>=<value> を使用してください"
-
-#: ../clients/cli/settings.c:2884
-#, c-format
-msgid "index '%s' is not valid"
-msgstr "インデックス '%s' は無効です"
-
-#: ../clients/cli/settings.c:2889 ../clients/cli/settings.c:2914
-msgid "no item to remove"
-msgstr "削除するアイテムがありません"
-
-#: ../clients/cli/settings.c:2893 ../clients/cli/settings.c:2918
-#, c-format
-msgid "index '%d' is not in range <0-%d>"
-msgstr "インデックス '%d' は範囲内にありません <0-%d>"
-
-#: ../clients/cli/settings.c:2933
-#, c-format
-msgid "invalid option '%s'"
-msgstr "無効なオプション '%s'"
-
-#: ../clients/cli/settings.c:2935
-msgid "missing option"
-msgstr "足りないオプション"
-
-#: ../clients/cli/settings.c:2962 ../clients/cli/settings.c:2982
-#: ../clients/cli/settings.c:3002 ../clients/cli/settings.c:3022
+#: ../clients/cli/settings.c:1423 ../clients/cli/settings.c:1443
+#: ../clients/cli/settings.c:1463 ../clients/cli/settings.c:1483
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../clients/cli/settings.c:3056
+#: ../clients/cli/settings.c:1517
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "'%s' は有効な値ではありません。-1、0、または 1 を使用してください"
 
-#: ../clients/cli/settings.c:3089
+#: ../clients/cli/settings.c:1550
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/cli/settings.c:3148
+#: ../clients/cli/settings.c:1609
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "'%s' は有効なフラグ番号ではありません。<0-%d> を使用してください"
 
-#: ../clients/cli/settings.c:3160
+#: ../clients/cli/settings.c:1621
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 "警告: 合計 '%s' がすべてのフラグよりも大きいです => すべてのフラグが設定され"
 "ています\n"
 
-#: ../clients/cli/settings.c:3211
+#: ../clients/cli/settings.c:1672
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../clients/cli/settings.c:3241
-#, c-format
-msgid "'%s' is not a valid MAC"
-msgstr "'%s' は有効な MAC ではありません"
-
-#. Don't allow setting type unless the connection is brand new.
-#. * Just because it's a bad idea and the user wouldn't probably want that.
-#. * No technical reason, really.
-#. * Also, using uuid to see if the connection is brand new is a bit
-#. * hacky: we can not see if the type is already set, because
-#. * nmc_setting_set_property() is called only after the property
-#. * we're setting (type) has been removed.
-#: ../clients/cli/settings.c:3269
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "不明な/未処理の Bluetooth 接続タイプ"
-
-#: ../clients/cli/settings.c:3293 ../libnm-core/nm-setting-connection.c:887
-#: ../libnm-util/nm-setting-connection.c:791
-#, c-format
-msgid "'%s' is not a valid UUID"
-msgstr "'%s' は有効な UUID ではありません"
-
-#: ../clients/cli/settings.c:3360
-#, c-format
-msgid "the property doesn't contain permission '%s'"
-msgstr "プロパティーにはパーミッション '%s' が含まれません"
-
-#: ../clients/cli/settings.c:3372
-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"
-
-#: ../clients/cli/settings.c:3391
-#, c-format
-msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr ""
-"'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
-
-#: ../clients/cli/settings.c:3436
-#, c-format
-msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
-
-#: ../clients/cli/settings.c:3440 ../clients/cli/settings.c:3455
-#, c-format
-msgid "'%s' is not a VPN connection profile"
-msgstr "'%s' は VPN 接続プロファイルではありません"
-
-#: ../clients/cli/settings.c:3448
-#, c-format
-msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s' は既存のプロファイルの名前ではありません"
-
-#: ../clients/cli/settings.c:3482
-#, c-format
-msgid "the value '%s' is not a valid UUID"
-msgstr "値 '%s' は有効な UUID ではありません"
-
-#: ../clients/cli/settings.c:3489
-#, c-format
-msgid "the property doesn't contain UUID '%s'"
-msgstr "プロパティーには UUID '%s' が含まれません"
-
-#: ../clients/cli/settings.c:3501
-msgid ""
-"Enter secondary connections that should be activated when this connection "
-"is\n"
-"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
-"transparently translates names to UUIDs. Note that NetworkManager only "
-"supports\n"
-"VPNs as secondary connections at the moment.\n"
-"The items can be separated by commas or spaces.\n"
-"\n"
-"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-msgstr ""
-"この接続がアクティベートされたときにアクティベートする必要がある\n"
-"セカンダリー接続を入力してください。接続は UUID または ID (名前) のいずれかで"
-"指定できます。nmcli\n"
-"は名前を透過的に UUID に変換します。NetworkManager は現時点では VPN をセカン"
-"ダリー接続\n"
-"としてのみサポートします。\n"
-"項目はカンマまたはスペースで区切ることができます。\n"
-"\n"
-"例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-
-#: ../clients/cli/settings.c:3568
-msgid ""
-"Enter a value which indicates whether the connection is subject to a data\n"
-"quota, usage costs or other limitations. Accepted options are:\n"
-"'true','yes','on' to set the connection as metered\n"
-"'false','no','off' to set the connection as not metered\n"
-"'unknown' to let NetworkManager choose a value using some heuristics\n"
-msgstr ""
-"接続がデータクォータ、使用コスト、または他の制限に基づくかどうかを\n"
-"示す値を入力します。使用できるオプション:\n"
-"接続を測定対象として設定する場合は 'true'、'yes'、'on'\n"
-"接続を非測定として設定する場合は 'false'、'no'、'off'\n"
-"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
-"'unknown'\n"
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:1766 ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1864 ../clients/cli/settings.c:1898
+#: ../clients/cli/settings.c:8654
+msgid "<hidden>"
+msgstr "<hidden>"
 
-#: ../clients/cli/settings.c:3717
+#: ../clients/cli/settings.c:2004
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "プロパティーには EAP メソッド '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3734
+#: ../clients/cli/settings.c:2021
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5888,12 +5617,12 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3753
+#: ../clients/cli/settings.c:2040
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3769
+#: ../clients/cli/settings.c:2056
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5907,7 +5636,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3781
+#: ../clients/cli/settings.c:2068
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5924,13 +5653,13 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3801
+#: ../clients/cli/settings.c:2088
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3817
+#: ../clients/cli/settings.c:2104
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5947,7 +5676,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3837
+#: ../clients/cli/settings.c:2124
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5961,7 +5690,7 @@ msgstr ""
 "ください。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3908
+#: ../clients/cli/settings.c:2195
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5982,7 +5711,12 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:2243
+#, fuzzy, c-format
+msgid "invalid option '%s', use a combination of [%s]"
+msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
+
+#: ../clients/cli/settings.c:2411
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6013,32 +5747,229 @@ msgstr ""
 "\n"
 "例: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:4060
+#: ../clients/cli/settings.c:2486
+#, fuzzy, c-format
+msgid "%d (forever)"
+msgstr "%d (no)"
+
+#. Don't allow setting type unless the connection is brand new.
+#. * Just because it's a bad idea and the user wouldn't probably want that.
+#. * No technical reason, really.
+#. * Also, using uuid to see if the connection is brand new is a bit
+#. * hacky: we can not see if the type is already set, because
+#. * nmc_setting_set_property() is called only after the property
+#. * we're setting (type) has been removed.
+#: ../clients/cli/settings.c:2542
+#, fuzzy, c-format
+msgid "Can not change the connection type"
+msgstr "不明な/未処理の Bluetooth 接続タイプ"
+
+#: ../clients/cli/settings.c:2566 ../libnm-core/nm-setting-connection.c:887
+#: ../libnm-util/nm-setting-connection.c:791
+#, c-format
+msgid "'%s' is not a valid UUID"
+msgstr "'%s' は有効な UUID ではありません"
+
+#: ../clients/cli/settings.c:2633
+#, c-format
+msgid "the property doesn't contain permission '%s'"
+msgstr "プロパティーにはパーミッション '%s' が含まれません"
+
+#: ../clients/cli/settings.c:2645
+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"
+
+#: ../clients/cli/settings.c:2664
+#, c-format
+msgid "'%s' is not valid master; use ifname or connection UUID"
+msgstr ""
+"'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
+
+#: ../clients/cli/settings.c:2709
+#, c-format
+msgid "Warning: %s is not an UUID of any existing connection profile\n"
+msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
+
+#: ../clients/cli/settings.c:2713 ../clients/cli/settings.c:2728
+#, c-format
+msgid "'%s' is not a VPN connection profile"
+msgstr "'%s' は VPN 接続プロファイルではありません"
+
+#: ../clients/cli/settings.c:2721
+#, c-format
+msgid "'%s' is not a name of any exiting profile"
+msgstr "'%s' は既存のプロファイルの名前ではありません"
+
+#: ../clients/cli/settings.c:2755
+#, c-format
+msgid "the value '%s' is not a valid UUID"
+msgstr "値 '%s' は有効な UUID ではありません"
+
+#: ../clients/cli/settings.c:2762
+#, c-format
+msgid "the property doesn't contain UUID '%s'"
+msgstr "プロパティーには UUID '%s' が含まれません"
+
+#: ../clients/cli/settings.c:2774
+msgid ""
+"Enter secondary connections that should be activated when this connection "
+"is\n"
+"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+"transparently translates names to UUIDs. Note that NetworkManager only "
+"supports\n"
+"VPNs as secondary connections at the moment.\n"
+"The items can be separated by commas or spaces.\n"
+"\n"
+"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+msgstr ""
+"この接続がアクティベートされたときにアクティベートする必要がある\n"
+"セカンダリー接続を入力してください。接続は UUID または ID (名前) のいずれかで"
+"指定できます。nmcli\n"
+"は名前を透過的に UUID に変換します。NetworkManager は現時点では VPN をセカン"
+"ダリー接続\n"
+"としてのみサポートします。\n"
+"項目はカンマまたはスペースで区切ることができます。\n"
+"\n"
+"例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+
+#: ../clients/cli/settings.c:2841
+msgid ""
+"Enter a value which indicates whether the connection is subject to a data\n"
+"quota, usage costs or other limitations. Accepted options are:\n"
+"'true','yes','on' to set the connection as metered\n"
+"'false','no','off' to set the connection as not metered\n"
+"'unknown' to let NetworkManager choose a value using some heuristics\n"
+msgstr ""
+"接続がデータクォータ、使用コスト、または他の制限に基づくかどうかを\n"
+"示す値を入力します。使用できるオプション:\n"
+"接続を測定対象として設定する場合は 'true'、'yes'、'on'\n"
+"接続を非測定として設定する場合は 'false'、'no'、'off'\n"
+"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
+"'unknown'\n"
+
+#: ../clients/cli/settings.c:2890 ../clients/cli/settings.c:4309
+#: ../clients/cli/settings.c:4355 ../clients/cli/settings.c:4392
+#: ../clients/cli/settings.c:4451 ../clients/cli/settings.c:5400
+#: ../libnm-core/nm-keyfile-reader.c:612
+#, c-format
+msgid "invalid option '%s', use one of [%s]"
+msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
+
+#: ../clients/cli/settings.c:2912
+msgid "0 (disabled)"
+msgstr "0 (無効)"
+
+#: ../clients/cli/settings.c:2918
+msgid "enabled, "
+msgstr "有効、"
+
+#: ../clients/cli/settings.c:2920
+msgid "advertise, "
+msgstr "公表、"
+
+#: ../clients/cli/settings.c:2922
+msgid "willing, "
+msgstr "用意がある、"
+
+#: ../clients/cli/settings.c:2950
+msgid "-1 (unset)"
+msgstr "-1 (未設定)"
+
+#: ../clients/cli/settings.c:3060
+#, c-format
+msgid "'%s' is not a valid DCB flag"
+msgstr "'%s' は有効な DCB フラグではありません"
+
+#: ../clients/cli/settings.c:3083
+#, c-format
+msgid "'%s' is not a DCB app priority"
+msgstr "'%s' は DCB アプリケーションの優先度ではありません"
+
+#: ../clients/cli/settings.c:3109
+msgid "must contain 8 comma-separated numbers"
+msgstr "コンマで区切った 8 つの番号を含ませてください"
+
+#: ../clients/cli/settings.c:3126
+#, c-format
+msgid "'%s' not a number between 0 and %u (inclusive) or %u"
+msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
+
+#: ../clients/cli/settings.c:3129
+#, c-format
+msgid "'%s' not a number between 0 and %u (inclusive)"
+msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
+
+#: ../clients/cli/settings.c:3151
+#, c-format
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+"\n"
+msgstr ""
+"警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
+"\n"
+
+#: ../clients/cli/settings.c:3204
+#, c-format
+msgid "bandwidth percentages must total 100%%"
+msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
+
+#: ../clients/cli/settings.c:3306 ../clients/cli/settings.c:3312
+msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
+msgstr ""
+"SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があり"
+"ます"
+
+#: ../clients/cli/settings.c:3335
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' は有効な InfiniBand MAC ではありません"
 
-#: ../clients/cli/settings.c:4097
+#: ../clients/cli/settings.c:3372
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/cli/settings.c:4128
+#: ../clients/cli/settings.c:3389 ../clients/cli/settings.c:5007
+#: ../clients/cli/settings.c:5256
+msgid "auto"
+msgstr "自動"
+
+#: ../clients/cli/settings.c:3402 ../clients/cli/settings.c:5287
+msgid "default"
+msgstr "デフォルト"
+
+#: ../clients/cli/settings.c:3451
 #, c-format
-msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "'%s' は無効です (書式: ip[/prefix] [next-hop] [metric])"
+msgid "invalid mode '%s', use one of %s"
+msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
 
-#: ../clients/cli/settings.c:4176 ../clients/cli/settings.c:4195
+#: ../clients/cli/settings.c:3611
+#, c-format
+msgid "%d (off)"
+msgstr "%d (off)"
+
+#: ../clients/cli/settings.c:3652 ../clients/cli/settings.c:3671
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../clients/cli/settings.c:4201 ../clients/cli/settings.c:4509
+#: ../clients/cli/settings.c:3677 ../clients/cli/settings.c:4015
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "プロパティーには DNS サーバー '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4213
+#: ../clients/cli/settings.c:3689
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6048,22 +5979,22 @@ msgstr ""
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:4249 ../clients/cli/settings.c:4563
+#: ../clients/cli/settings.c:3725 ../clients/cli/settings.c:4069
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4287 ../clients/cli/settings.c:4601
+#: ../clients/cli/settings.c:3763 ../clients/cli/settings.c:4107
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "プロパティーには DNS オプション '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4341 ../clients/cli/settings.c:4654
+#: ../clients/cli/settings.c:3817 ../clients/cli/settings.c:4160
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "プロパティーには IP アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4354
+#: ../clients/cli/settings.c:3830
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6077,17 +6008,17 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4370 ../clients/cli/settings.c:4683
+#: ../clients/cli/settings.c:3846 ../clients/cli/settings.c:4189
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効なゲートウェイアドレス '%s'"
 
-#: ../clients/cli/settings.c:4425 ../clients/cli/settings.c:4738
+#: ../clients/cli/settings.c:3901 ../clients/cli/settings.c:4244
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "プロパティーにはルート '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4438
+#: ../clients/cli/settings.c:3914
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6110,12 +6041,12 @@ msgstr ""
 "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4484 ../clients/cli/settings.c:4503
+#: ../clients/cli/settings.c:3990 ../clients/cli/settings.c:4009
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../clients/cli/settings.c:4521
+#: ../clients/cli/settings.c:4027
 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 "
@@ -6134,7 +6065,7 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4667
+#: ../clients/cli/settings.c:4173
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6148,7 +6079,7 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4751
+#: ../clients/cli/settings.c:4257
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6173,28 +6104,33 @@ msgstr ""
 "beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4768 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4274 ../libnm-core/nm-setting-gsm.c:381
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../clients/cli/settings.c:4775
+#: ../clients/cli/settings.c:4281
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
 
-#: ../clients/cli/settings.c:4822
+#: ../clients/cli/settings.c:4494
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
 
-#: ../clients/cli/settings.c:4859
+#: ../clients/cli/settings.c:4563
+#, fuzzy, c-format
+msgid "invalid method '%s', use one of %s"
+msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
+
+#: ../clients/cli/settings.c:4628
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' は無効です; [e, o, n] を使用してください"
 
-#: ../clients/cli/settings.c:4887
+#: ../clients/cli/settings.c:4658
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -6212,34 +6148,52 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4927
+#: ../clients/cli/settings.c:4710
+#, c-format
+msgid "invalid option '%s', use '%s' or '%s'"
+msgstr "無効なオプション '%s' です。'%s' または '%s' を使用してください"
+
+#: ../clients/cli/settings.c:4781
 msgid "no priority to remove"
 msgstr "削除する優先度がありません"
 
-#: ../clients/cli/settings.c:4931
+#: ../clients/cli/settings.c:4785
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
 
-#: ../clients/cli/settings.c:4970
+#: ../clients/cli/settings.c:4824
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
 msgstr ""
 "警告: マッピングは一度に 1 つだけ行えます。最初のマッピング (%s) を行います\n"
 
-#: ../clients/cli/settings.c:4977
+#: ../clients/cli/settings.c:4831
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "プロパティーにはマッピング '%s' が含まれません"
 
-#: ../clients/cli/settings.c:5025
+#: ../clients/cli/settings.c:4910
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "'%s' を空白にすることはできません"
 
-#: ../clients/cli/settings.c:5100 ../clients/cli/settings.c:5267
-#: ../libnm-core/nm-setting-wired.c:662 ../libnm-core/nm-setting-wireless.c:857
+#: ../clients/cli/settings.c:5053
+#, c-format
+msgid ""
+"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
+"'none'"
+msgstr ""
+"無効なオプション '%s' です。[%s]、'ignore'、'default'、または 'none' の組み合"
+"わせを使用してください"
+
+#: ../clients/cli/settings.c:5064
+msgid "'default' and 'ignore' are incompatible with other flags"
+msgstr "'default' と 'ignore' は他のフラグと使用できません"
+
+#: ../clients/cli/settings.c:5115 ../clients/cli/settings.c:5360
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
 #: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
 #: ../libnm-util/nm-setting-wireless.c:859
 #: ../libnm-util/nm-setting-wireless.c:873
@@ -6247,17 +6201,17 @@ msgstr "'%s' を空白にすることはできません"
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' は有効な MAC アドレスではありません"
 
-#: ../clients/cli/settings.c:5106 ../clients/cli/settings.c:5273
+#: ../clients/cli/settings.c:5121 ../clients/cli/settings.c:5366
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "プロパティーには MAC アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:5125
+#: ../clients/cli/settings.c:5140
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' は無効です; 2  文字または 3 文字の文字列を入力してください"
 
-#: ../clients/cli/settings.c:5139
+#: ../clients/cli/settings.c:5154
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6267,12 +6221,12 @@ msgstr ""
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:5161
+#: ../clients/cli/settings.c:5176
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "'%s' 文字列値は 1〜199 の文字で構成される必要があります"
 
-#: ../clients/cli/settings.c:5193
+#: ../clients/cli/settings.c:5208
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6283,30 +6237,35 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/cli/settings.c:5239
+#: ../clients/cli/settings.c:5291
+#, c-format
+msgid "always"
+msgstr "always"
+
+#: ../clients/cli/settings.c:5332
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5245
+#: ../clients/cli/settings.c:5338
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5339
+#: ../clients/cli/settings.c:5432
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr ""
 "無効なオプション '%s' です。'default'、'never'、または 'always' を使用してく"
 "ださい"
 
-#: ../clients/cli/settings.c:5400 ../clients/cli/settings.c:5439
-#: ../clients/cli/settings.c:5478
+#: ../clients/cli/settings.c:5542 ../clients/cli/settings.c:5581
+#: ../clients/cli/settings.c:5620
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "プロパティーにはプロトコル '%s' が含まれません"
 
-#: ../clients/cli/settings.c:5517
+#: ../clients/cli/settings.c:5659
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6315,23 +6274,23 @@ msgstr ""
 "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
 "定してください。"
 
-#: ../clients/cli/settings.c:5525
+#: ../clients/cli/settings.c:5667
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP キーは '%s' であると仮定しています\n"
 
-#: ../clients/cli/settings.c:5527
+#: ../clients/cli/settings.c:5669
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "WEP キーインデックスは '%d' に設定されます\n"
 
-#: ../clients/cli/settings.c:5550
+#: ../clients/cli/settings.c:5692
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' は [0 (unknown), 1 (key), 2 (passphrase)] にはありません"
 
-#: ../clients/cli/settings.c:5566 ../clients/cli/settings.c:5569
-#: ../clients/cli/settings.c:5572 ../clients/cli/settings.c:5575
+#: ../clients/cli/settings.c:5708 ../clients/cli/settings.c:5711
+#: ../clients/cli/settings.c:5714 ../clients/cli/settings.c:5717
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6340,7 +6299,7 @@ msgstr ""
 "警告: '%s' と '%s' タイプは互換性がありません。キーを変更するか、キーを削除し"
 "てください。\n"
 
-#: ../clients/cli/settings.c:5588
+#: ../clients/cli/settings.c:5730
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6349,83 +6308,62 @@ msgstr ""
 "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
 "key、2 または passphrase です。\n"
 
-#: ../clients/cli/settings.c:5601
+#: ../clients/cli/settings.c:5743
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/settings.c:5645
-#, c-format
-msgid "'%s' is not a valid DCB flag"
-msgstr "'%s' は有効な DCB フラグではありません"
-
-#: ../clients/cli/settings.c:5668
-#, c-format
-msgid "'%s' is not a DCB app priority"
-msgstr "'%s' は DCB アプリケーションの優先度ではありません"
-
-#: ../clients/cli/settings.c:5694
-msgid "must contain 8 comma-separated numbers"
-msgstr "コンマで区切った 8 つの番号を含ませてください"
-
-#: ../clients/cli/settings.c:5711
+#: ../clients/cli/settings.c:5820
 #, c-format
-msgid "'%s' not a number between 0 and %u (inclusive) or %u"
-msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
+msgid "Do you also want to set '%s' to '%s'? [yes]: "
+msgstr "'%s' を '%s' に設定しますか? [yes]: "
 
-#: ../clients/cli/settings.c:5714
+#: ../clients/cli/settings.c:5822
 #, c-format
-msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
+msgid "Do you also want to clear '%s'? [yes]: "
+msgstr "'%s' も消去しますか? [yes]: "
 
-#: ../clients/cli/settings.c:5736
+#: ../clients/cli/settings.c:5998
 #, c-format
 msgid ""
-"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
-"\n"
+"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
-"警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
-"\n"
+"警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視さ"
+"れることがあります\n"
 
-#: ../clients/cli/settings.c:5789
+#: ../clients/cli/settings.c:6017
 #, c-format
-msgid "bandwidth percentages must total 100%%"
-msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
-
-#: ../clients/cli/settings.c:5875 ../clients/cli/settings.c:5881
-msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
+msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
-"SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があり"
-"ます"
+"警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
 
-#: ../clients/cli/settings.c:5924
-#, c-format
-msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "無効なオプション '%s' です。'%s' または '%s' を使用してください"
+#: ../clients/cli/settings.c:6019
+msgid "Do you want to remove them? [yes] "
+msgstr "削除しますか? [yes] "
 
-#: ../clients/cli/settings.c:8049
+#: ../clients/cli/settings.c:8402
 msgid "don't know how to get the property value"
 msgstr "プロパティ値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:8102 ../clients/cli/settings.c:8142
+#: ../clients/cli/settings.c:8455 ../clients/cli/settings.c:8495
 msgid "the property can't be changed"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:8247
+#: ../clients/cli/settings.c:8600
 msgid "[NM property description]"
 msgstr "[NM プロパティの詳細]"
 
-#: ../clients/cli/settings.c:8252
+#: ../clients/cli/settings.c:8605
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
-#: ../clients/cli/utils.c:147
+#: ../clients/cli/utils.c:211
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr ""
 "エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
 
-#: ../clients/cli/utils.c:150
+#: ../clients/cli/utils.c:214
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
@@ -6433,52 +6371,41 @@ msgstr "エラー: 予期しない引数 '%s' です"
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/cli/utils.c:490 ../clients/cli/utils.c:521
+#: ../clients/cli/utils.c:554 ../clients/cli/utils.c:585
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' が不明瞭です (%s)"
 
-#: ../clients/cli/utils.c:500
+#: ../clients/cli/utils.c:564
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/utils.c:533
+#: ../clients/cli/utils.c:597
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' は無効です;  [%s]、[%s]、または [%s] を使用してください"
 
-#: ../clients/cli/utils.c:632
+#: ../clients/cli/utils.c:696
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/utils.c:644
+#: ../clients/cli/utils.c:708
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
 
-#: ../clients/cli/utils.c:891
+#: ../clients/cli/utils.c:955
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../clients/cli/utils.c:894
+#: ../clients/cli/utils.c:958
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/utils.c:951
-msgid "Option '--terse' requires specifying '--fields'"
-msgstr "オプション '--terse' には '--fields' の指定が必要です"
-
-#: ../clients/cli/utils.c:955
-#, c-format
-msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr ""
-"オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' では"
-"ありません"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "認証セッションはすでに実行されています。"
@@ -6488,8 +6415,8 @@ msgstr "認証セッションはすでに実行されています。"
 #: ../clients/common/nm-secret-agent-simple.c:303
 #: ../clients/common/nm-secret-agent-simple.c:342
 #: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:537
+#: ../clients/common/nm-secret-agent-simple.c:538
+#: ../clients/common/nm-secret-agent-simple.c:556
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:120
 #: ../clients/common/nm-vpn-helpers.c:124
@@ -6563,20 +6490,33 @@ msgid "PIN"
 msgstr "PIN"
 
 #: ../clients/common/nm-secret-agent-simple.c:500
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:533
+#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-secret-agent-simple.c:552
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドのネットワークパスワード"
 
 #: ../clients/common/nm-secret-agent-simple.c:501
-#: ../clients/common/nm-secret-agent-simple.c:516
-#: ../clients/common/nm-secret-agent-simple.c:534
-#: ../clients/common/nm-secret-agent-simple.c:554
+#: ../clients/common/nm-secret-agent-simple.c:535
+#: ../clients/common/nm-secret-agent-simple.c:553
+#: ../clients/common/nm-secret-agent-simple.c:573
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
-#: ../clients/common/nm-secret-agent-simple.c:549
+#: ../clients/common/nm-secret-agent-simple.c:515
+#, c-format
+msgid "Secrets are required to access the MACsec network '%s'"
+msgstr ""
+
+#: ../clients/common/nm-secret-agent-simple.c:519
+msgid "MACsec PSK authentication"
+msgstr ""
+
+#: ../clients/common/nm-secret-agent-simple.c:528
+msgid "MACsec EAP authentication"
+msgstr ""
+
+#: ../clients/common/nm-secret-agent-simple.c:568
 msgid "VPN password required"
 msgstr "PIN パスワードが必要です"
 
@@ -6629,11 +6569,21 @@ msgstr "クッキー"
 msgid "Gateway certificate hash"
 msgstr "ゲートウェイ証明書ハッシュ"
 
-#: ../clients/nm-online.c:114
+#: ../clients/nm-online.c:91
 msgid "Connecting"
 msgstr "接続中"
 
-#: ../clients/nm-online.c:181
+#: ../clients/nm-online.c:189
+#, fuzzy, c-format
+msgid "Error: timeout creating NMClient object\n"
+msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
+
+#: ../clients/nm-online.c:209
+#, fuzzy, c-format
+msgid "Error: Could not create NMClient object: %s\n"
+msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
+
+#: ../clients/nm-online.c:235
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -6641,32 +6591,32 @@ msgstr ""
 "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は "
 "30)"
 
-#: ../clients/nm-online.c:182
+#: ../clients/nm-online.c:236
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
 
-#: ../clients/nm-online.c:183
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "出力を抑制する"
 
-#: ../clients/nm-online.c:184
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "接続の代わりに NetworkManager の起動を待機します"
 
-#: ../clients/nm-online.c:204
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "NetworkManager によりスタートアップネットワーク接続のアクティベートが完了され"
 "るのを待機します。"
 
-#: ../clients/nm-online.c:211 ../clients/nm-online.c:217
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
 "い。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:418
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
 #: ../clients/tui/nmtui.c:136
@@ -6699,8 +6649,8 @@ msgstr "エディターがシグナル %d で失敗しました"
 msgid "Could not re-read file: %s"
 msgstr "ファイルの再読み込みができませんでした: %s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1661
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
+#: ../libnm/nm-device.c:1617
 msgid "Ethernet"
 msgstr "Ethernet"
 
@@ -6709,8 +6659,8 @@ msgstr "Ethernet"
 msgid "Ethernet connection %d"
 msgstr "イーサネット接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
-#: ../libnm/nm-device.c:1663
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
+#: ../libnm/nm-device.c:1619
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -6719,8 +6669,8 @@ msgstr "Wi-Fi"
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1899
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1673
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1939
+#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1629
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
@@ -6729,8 +6679,8 @@ msgstr "InfiniBand"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
-#: ../libnm/nm-device.c:1671
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
+#: ../libnm/nm-device.c:1627
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -6748,10 +6698,10 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1891
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1675
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4308
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1931
+#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1631
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4499
 msgid "Bond"
 msgstr "ボンド"
 
@@ -6760,10 +6710,10 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1895
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1679
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4605
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1935
+#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1635
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4789
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -6772,10 +6722,10 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1893
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1677
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4414
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1933
+#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1633
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4602
 msgid "Team"
 msgstr "team "
 
@@ -6846,38 +6796,38 @@ msgstr "無効な接続 '%s' のエディタを作成できませんでした。
 msgid "Edit Connection"
 msgstr "接続の編集"
 
-#: ../clients/tui/nmt-editor.c:165
+#: ../clients/tui/nmt-editor.c:174
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "接続を保存できません: %s"
 
-#: ../clients/tui/nmt-editor.c:179
+#: ../clients/tui/nmt-editor.c:188
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "新しい接続を追加できません: %s"
 
-#: ../clients/tui/nmt-editor.c:321
+#: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
 msgstr "Ethernet デバイス"
 
-#: ../clients/tui/nmt-editor.c:334
+#: ../clients/tui/nmt-editor.c:346
 msgid "Device"
 msgstr "デバイス"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:394
+#: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
 msgstr "自動的に接続する"
 
-#: ../clients/tui/nmt-editor.c:400
+#: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
 msgstr "全ユーザーに使用可能"
 
-#: ../clients/tui/nmt-editor.c:415 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
 #: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
@@ -6923,7 +6873,7 @@ msgstr "MII (推奨)"
 msgid "ARP"
 msgstr "ARP"
 
-#: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:78
+#: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:85
 #: ../clients/tui/nmt-page-team.c:152
 msgid "Slaves"
 msgstr "スレーブ"
@@ -6968,7 +6918,7 @@ msgid "BRIDGE PORT"
 msgstr "ブリッジポート"
 
 #: ../clients/tui/nmt-page-bridge-port.c:67
-#: ../clients/tui/nmt-page-bridge.c:110
+#: ../clients/tui/nmt-page-bridge.c:118
 msgid "Priority"
 msgstr "優先度"
 
@@ -6980,32 +6930,32 @@ msgstr "パスコスト"
 msgid "Hairpin mode"
 msgstr "ヘアピンモード"
 
-#: ../clients/tui/nmt-page-bridge.c:88 ../clients/tui/nmt-page-bridge.c:119
-#: ../clients/tui/nmt-page-bridge.c:129 ../clients/tui/nmt-page-bridge.c:139
+#: ../clients/tui/nmt-page-bridge.c:96 ../clients/tui/nmt-page-bridge.c:127
+#: ../clients/tui/nmt-page-bridge.c:137 ../clients/tui/nmt-page-bridge.c:147
 msgid "seconds"
 msgstr "秒"
 
-#: ../clients/tui/nmt-page-bridge.c:89
+#: ../clients/tui/nmt-page-bridge.c:97
 msgid "Aging time"
 msgstr "エージングタイム"
 
-#: ../clients/tui/nmt-page-bridge.c:91
+#: ../clients/tui/nmt-page-bridge.c:99
 msgid "Enable IGMP snooping"
 msgstr "IGMP スヌーピングの有効化"
 
-#: ../clients/tui/nmt-page-bridge.c:97
+#: ../clients/tui/nmt-page-bridge.c:105
 msgid "Enable STP (Spanning Tree Protocol)"
 msgstr "STP の有効化 (ツリープロトコル全域)"
 
-#: ../clients/tui/nmt-page-bridge.c:120
+#: ../clients/tui/nmt-page-bridge.c:128
 msgid "Forward delay"
 msgstr "フォワード遅延"
 
-#: ../clients/tui/nmt-page-bridge.c:130
+#: ../clients/tui/nmt-page-bridge.c:138
 msgid "Hello time"
 msgstr "Hello タイム"
 
-#: ../clients/tui/nmt-page-bridge.c:140
+#: ../clients/tui/nmt-page-bridge.c:148
 msgid "Max age"
 msgstr "最大エイジ"
 
@@ -7834,50 +7784,50 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:229
 msgid "wrong type; should be a list of strings."
 msgstr "正しくないタイプ; 文字列のリストである必要があります。"
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:299
 msgid "unknown setting name"
 msgstr "不明な設定名"
 
-#: ../libnm-core/nm-connection.c:307
+#: ../libnm-core/nm-connection.c:311
 msgid "duplicate setting name"
 msgstr "重複する設定名"
 
-#: ../libnm-core/nm-connection.c:1044
+#: ../libnm-core/nm-connection.c:1080
 msgid "setting not found"
 msgstr "設定が見つかりません"
 
-#: ../libnm-core/nm-connection.c:1110
+#: ../libnm-core/nm-connection.c:1146
 msgid "setting not allowed in slave connection"
 msgstr "設定がスレーブ接続で許可されません"
 
-#: ../libnm-core/nm-connection.c:1126
+#: ../libnm-core/nm-connection.c:1162
 msgid "setting is required for non-slave connections"
 msgstr "設定は非スレーブ接続で必要です"
 
-#: ../libnm-core/nm-connection.c:1221
+#: ../libnm-core/nm-connection.c:1257
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確認するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1258
+#: ../libnm-core/nm-connection.c:1296
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正規化するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1759 ../libnm-core/nm-setting-8021x.c:2654
-#: ../libnm-core/nm-setting-8021x.c:2671 ../libnm-core/nm-setting-8021x.c:2702
-#: ../libnm-core/nm-setting-8021x.c:2719 ../libnm-core/nm-setting-8021x.c:2761
-#: ../libnm-core/nm-setting-8021x.c:2773 ../libnm-core/nm-setting-8021x.c:2791
-#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2827
-#: ../libnm-core/nm-setting-8021x.c:2992 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-connection.c:1797 ../libnm-core/nm-setting-8021x.c:2872
+#: ../libnm-core/nm-setting-8021x.c:2889 ../libnm-core/nm-setting-8021x.c:2920
+#: ../libnm-core/nm-setting-8021x.c:2937 ../libnm-core/nm-setting-8021x.c:2979
+#: ../libnm-core/nm-setting-8021x.c:2991 ../libnm-core/nm-setting-8021x.c:3009
+#: ../libnm-core/nm-setting-8021x.c:3021 ../libnm-core/nm-setting-8021x.c:3045
+#: ../libnm-core/nm-setting-8021x.c:3226 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:159
 #: ../libnm-core/nm-setting-connection.c:871
 #: ../libnm-core/nm-setting-connection.c:912
-#: ../libnm-core/nm-setting-connection.c:1025
-#: ../libnm-core/nm-setting-ip-config.c:2258
+#: ../libnm-core/nm-setting-connection.c:1026
+#: ../libnm-core/nm-setting-ip-config.c:2409
 #: ../libnm-core/nm-setting-ip-tunnel.c:352
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
@@ -7906,7 +7856,7 @@ msgstr "接続を正規化するときの予期しない障害"
 msgid "property is missing"
 msgstr "プロパティがありません"
 
-#: ../libnm-core/nm-connection.c:1902
+#: ../libnm-core/nm-connection.c:1942
 msgid "IP Tunnel"
 msgstr "IP トンネル"
 
@@ -7915,219 +7865,220 @@ msgstr "IP トンネル"
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
 
-#: ../libnm-core/nm-keyfile-reader.c:142
+#: ../libnm-core/nm-keyfile-reader.c:144
 msgid "ignoring missing number"
 msgstr "不明な数字を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:151
+#: ../libnm-core/nm-keyfile-reader.c:153
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効な数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:171
+#: ../libnm-core/nm-keyfile-reader.c:173
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効な %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:211
+#: ../libnm-core/nm-keyfile-reader.c:213
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:231
+#: ../libnm-core/nm-keyfile-reader.c:233
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効な %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:349
+#: ../libnm-core/nm-keyfile-reader.c:351
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:359
+#: ../libnm-core/nm-keyfile-reader.c:361
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:368
+#: ../libnm-core/nm-keyfile-reader.c:370
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:379
+#: ../libnm-core/nm-keyfile-reader.c:381
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s の後のガーベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:385
+#: ../libnm-core/nm-keyfile-reader.c:387
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s の後の非推奨のセミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:400
+#: ../libnm-core/nm-keyfile-reader.c:402
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:407
+#: ../libnm-core/nm-keyfile-reader.c:409
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:510
+#: ../libnm-core/nm-keyfile-reader.c:543
 #, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
 msgstr "無効な DNS サーバー IPv4 アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:549
+#: ../libnm-core/nm-keyfile-reader.c:582
 #, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
 msgstr "無効な DNS サーバー IPv6 アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:644 ../libnm-core/nm-keyfile-reader.c:1540
+#: ../libnm-core/nm-keyfile-reader.c:676 ../libnm-core/nm-keyfile-reader.c:1603
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:655
+#: ../libnm-core/nm-keyfile-reader.c:687
 msgid "ignoring invalid MAC address"
 msgstr "有効な MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:864
+#: ../libnm-core/nm-keyfile-reader.c:924
 msgid "ignoring invalid SSID"
 msgstr "無効な SSID を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:880
+#: ../libnm-core/nm-keyfile-reader.c:940
 msgid "ignoring invalid raw password"
 msgstr "無効な生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:955 ../libnm-core/nm-keyfile-reader.c:1131
+#: ../libnm-core/nm-keyfile-reader.c:1015
+#: ../libnm-core/nm-keyfile-reader.c:1191
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "証明書またはキーファイル '%s' が存在しません"
 
-#: ../libnm-core/nm-keyfile-reader.c:960
+#: ../libnm-core/nm-keyfile-reader.c:1020
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効なキー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile-reader.c:970
+#: ../libnm-core/nm-keyfile-reader.c:1030
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr ""
 
-#: ../libnm-core/nm-keyfile-reader.c:1008
+#: ../libnm-core/nm-keyfile-reader.c:1068
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
 
-#: ../libnm-core/nm-keyfile-reader.c:1021
+#: ../libnm-core/nm-keyfile-reader.c:1081
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効なキー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile-reader.c:1168
+#: ../libnm-core/nm-keyfile-reader.c:1228
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効なキー/証明書値は有効なブロブではありません"
 
-#: ../libnm-core/nm-keyfile-reader.c:1173
+#: ../libnm-core/nm-keyfile-reader.c:1233
 msgid "invalid key/cert value"
 msgstr "無効なキー/証明書値"
 
-#: ../libnm-core/nm-keyfile-reader.c:1220
+#: ../libnm-core/nm-keyfile-reader.c:1280
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効なパリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:1238
+#: ../libnm-core/nm-keyfile-reader.c:1298
 #, fuzzy, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "無効な %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1441
+#: ../libnm-core/nm-keyfile-reader.c:1504
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "設定値のロード中にエラーが発生しました: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1473
+#: ../libnm-core/nm-keyfile-reader.c:1536
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "無効な負の値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1494
+#: ../libnm-core/nm-keyfile-reader.c:1557
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "無効な char 値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1517
+#: ../libnm-core/nm-keyfile-reader.c:1580
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "無効な int64 値 (%s)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1576
+#: ../libnm-core/nm-keyfile-reader.c:1639
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
 msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1589
+#: ../libnm-core/nm-keyfile-reader.c:1652
 #, c-format
 msgid "unhandled setting property type '%s'"
 msgstr "プロパティータイプ '%s' の設定が未処理"
 
-#: ../libnm-core/nm-keyfile-reader.c:1620
+#: ../libnm-core/nm-keyfile-reader.c:1683
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効な設定名 '%s'"
 
-#: ../libnm-core/nm-setting-8021x.c:414
+#: ../libnm-core/nm-setting-8021x.c:436
 msgid "data missing"
 msgstr "データがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:450
+#: ../libnm-core/nm-setting-8021x.c:472
 msgid "binary data missing"
 msgstr "バイナリーデータがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:478
+#: ../libnm-core/nm-setting-8021x.c:500
 #, fuzzy
 msgid "URI not NUL terminated"
 msgstr "file:// URI が NUL で終了していません"
 
-#: ../libnm-core/nm-setting-8021x.c:487
+#: ../libnm-core/nm-setting-8021x.c:509
 #, fuzzy
 msgid "URI is empty"
 msgstr "file:// URI が空です"
 
-#: ../libnm-core/nm-setting-8021x.c:495
+#: ../libnm-core/nm-setting-8021x.c:517
 #, fuzzy
 msgid "URI is not valid UTF-8"
 msgstr "file:// URI が有効な UTF-8 ではありません"
 
-#: ../libnm-core/nm-setting-8021x.c:731 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
 msgstr "CA 証明書は X.509 形式である必要があります"
 
-#: ../libnm-core/nm-setting-8021x.c:1101 ../libnm-core/nm-setting-8021x.c:1405
-#: ../libnm-core/nm-setting-8021x.c:1781 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
+#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "無効な証明書形式"
 
-#: ../libnm-core/nm-setting-8021x.c:2098 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "無効なプライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2445 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr "無効な phase2 プライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2661 ../libnm-core/nm-setting-8021x.c:2678
-#: ../libnm-core/nm-setting-8021x.c:2709 ../libnm-core/nm-setting-8021x.c:2726
-#: ../libnm-core/nm-setting-8021x.c:2767 ../libnm-core/nm-setting-8021x.c:2779
-#: ../libnm-core/nm-setting-8021x.c:2797 ../libnm-core/nm-setting-8021x.c:2809
-#: ../libnm-core/nm-setting-8021x.c:2834 ../libnm-core/nm-setting-adsl.c:196
-#: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
+#: ../libnm-core/nm-setting-8021x.c:2879 ../libnm-core/nm-setting-8021x.c:2896
+#: ../libnm-core/nm-setting-8021x.c:2927 ../libnm-core/nm-setting-8021x.c:2944
+#: ../libnm-core/nm-setting-8021x.c:2985 ../libnm-core/nm-setting-8021x.c:2997
+#: ../libnm-core/nm-setting-8021x.c:3015 ../libnm-core/nm-setting-8021x.c:3027
+#: ../libnm-core/nm-setting-8021x.c:3052 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
 #: ../libnm-core/nm-setting-connection.c:878
-#: ../libnm-core/nm-setting-connection.c:923 ../libnm-core/nm-setting-gsm.c:281
-#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-connection.c:923 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2416
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8135,7 +8086,7 @@ msgstr "無効な phase2 プライベートキー"
 #: ../libnm-core/nm-setting-wimax.c:135
 #: ../libnm-core/nm-setting-wireless-security.c:891
 #: ../libnm-core/nm-setting-wireless-security.c:915
-#: ../libnm-core/nm-setting.c:1134 ../libnm-util/nm-setting-8021x.c:2332
+#: ../libnm-core/nm-setting.c:1135 ../libnm-util/nm-setting-8021x.c:2332
 #: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
 #: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
 #: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
@@ -8154,19 +8105,24 @@ msgstr "無効な phase2 プライベートキー"
 msgid "property is empty"
 msgstr "プロパティが空です"
 
-#: ../libnm-core/nm-setting-8021x.c:2691 ../libnm-core/nm-setting-8021x.c:2739
+#: ../libnm-core/nm-setting-8021x.c:2909 ../libnm-core/nm-setting-8021x.c:2957
 #: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
 #: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "PKCS#12 の '%s' プロパティと一致しなければなりません"
 
-#: ../libnm-core/nm-setting-8021x.c:2966
+#: ../libnm-core/nm-setting-8021x.c:3188
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "証明書が無効です: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:3001
+#: ../libnm-core/nm-setting-8021x.c:3198
+#, c-format
+msgid "password is not supported when certificate is not on a PKCS#11 token"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:3235
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../libnm-core/nm-setting-infiniband.c:192
 #: ../libnm-core/nm-setting-infiniband.c:207
@@ -8174,8 +8130,8 @@ msgstr "証明書が無効です: %s"
 #: ../libnm-core/nm-setting-ip6-config.c:215
 #: ../libnm-core/nm-setting-ip6-config.c:226
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
-#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:676
-#: ../libnm-core/nm-setting-wired.c:686
+#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
+#: ../libnm-core/nm-setting-wired.c:688
 #: ../libnm-core/nm-setting-wireless-security.c:934
 #: ../libnm-core/nm-setting-wireless-security.c:943
 #: ../libnm-core/nm-setting-wireless-security.c:952
@@ -8207,9 +8163,9 @@ msgstr "証明書が無効です: %s"
 msgid "property is invalid"
 msgstr "プロパティが無効です"
 
-#: ../libnm-core/nm-setting-8021x.c:3026 ../libnm-core/nm-setting-8021x.c:3036
-#: ../libnm-core/nm-setting-8021x.c:3046 ../libnm-core/nm-setting-8021x.c:3056
-#: ../libnm-core/nm-setting-8021x.c:3066 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-8021x.c:3260 ../libnm-core/nm-setting-8021x.c:3270
+#: ../libnm-core/nm-setting-8021x.c:3280 ../libnm-core/nm-setting-8021x.c:3299
+#: ../libnm-core/nm-setting-8021x.c:3309 ../libnm-core/nm-setting-adsl.c:208
 #: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
 #: ../libnm-core/nm-setting-wireless-security.c:870
 #: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
@@ -8221,53 +8177,58 @@ msgstr "プロパティが無効です"
 msgid "'%s' is not a valid value for the property"
 msgstr "'%s' は有効なプロパティの値ではありません"
 
+#: ../libnm-core/nm-setting-8021x.c:3290
+#, fuzzy
+msgid "invalid auth flags"
+msgstr "無効なルート: %s"
+
 #: ../libnm-core/nm-setting-bluetooth.c:168
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-bond.c:550 ../libnm-util/nm-setting-bond.c:502
+#: ../libnm-core/nm-setting-bond.c:552 ../libnm-util/nm-setting-bond.c:502
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "無効なオプション '%s'、またはその値 '%s' です"
 
-#: ../libnm-core/nm-setting-bond.c:575 ../libnm-util/nm-setting-bond.c:521
+#: ../libnm-core/nm-setting-bond.c:577 ../libnm-util/nm-setting-bond.c:521
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "設定できるのは '%s' と '%s' の一つのみです"
 
-#: ../libnm-core/nm-setting-bond.c:588 ../libnm-util/nm-setting-bond.c:532
+#: ../libnm-core/nm-setting-bond.c:590 ../libnm-util/nm-setting-bond.c:532
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "必須オプションの '%s' がありません"
 
-#: ../libnm-core/nm-setting-bond.c:598 ../libnm-util/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:600 ../libnm-util/nm-setting-bond.c:541
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "'%s' は有効な '%s' の値ではありません"
 
-#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:554
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:554
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
 
-#: ../libnm-core/nm-setting-bond.c:627
+#: ../libnm-core/nm-setting-bond.c:629
 #, fuzzy, c-format
 msgid "'%s' is not a valid for '%s' option: %s"
 msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:577
+#: ../libnm-core/nm-setting-bond.c:640 ../libnm-util/nm-setting-bond.c:577
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
 
-#: ../libnm-core/nm-setting-bond.c:651 ../libnm-util/nm-setting-bond.c:590
+#: ../libnm-core/nm-setting-bond.c:653 ../libnm-util/nm-setting-bond.c:590
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "'%s=%s' は '%s' の有効な設定ではありません"
 
-#: ../libnm-core/nm-setting-bond.c:664 ../libnm-core/nm-setting-bond.c:673
-#: ../libnm-core/nm-setting-bond.c:693 ../libnm-core/nm-setting-bond.c:729
+#: ../libnm-core/nm-setting-bond.c:666 ../libnm-core/nm-setting-bond.c:675
+#: ../libnm-core/nm-setting-bond.c:695 ../libnm-core/nm-setting-bond.c:731
 #: ../libnm-util/nm-setting-bond.c:603 ../libnm-util/nm-setting-bond.c:612
 #: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668
 #, c-format
@@ -8275,46 +8236,38 @@ msgid "'%s' option requires '%s' option to be set"
 msgstr ""
 "'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:704 ../libnm-util/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:706 ../libnm-util/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' option is empty"
 msgstr "'%s' オプションが空白です"
 
-#: ../libnm-core/nm-setting-bond.c:716 ../libnm-util/nm-setting-bond.c:655
+#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:655
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-setting-bond.c:744 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:746 ../libnm-util/nm-setting-bond.c:682
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "'%s' オプションはモード '%s' でのみ有効です"
 
-#: ../libnm-core/nm-setting-bond.c:755
+#: ../libnm-core/nm-setting-bond.c:757
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "'%s' と '%s' の値は同じである必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:771
+#: ../libnm-core/nm-setting-bond.c:773
 #, c-format
 msgid "'%s' option should be string"
 msgstr "'%s' オプションは文字列である必要があります"
 
-#: ../libnm-core/nm-setting-bridge-port.c:124
-#: ../libnm-core/nm-setting-bridge-port.c:136
-#: ../libnm-util/nm-setting-bridge-port.c:154
-#: ../libnm-util/nm-setting-bridge-port.c:166
-#, c-format
-msgid "'%d' is not a valid value for the property (should be <= %d)"
-msgstr "'%d' はプロパティの有効な値ではありません (%d 以下となるはずです)"
-
-#: ../libnm-core/nm-setting-bridge-port.c:154
+#: ../libnm-core/nm-setting-bridge-port.c:127
 #: ../libnm-core/nm-setting-team-port.c:99
 #, c-format
 msgid "missing setting"
 msgstr "不明な設定"
 
-#: ../libnm-core/nm-setting-bridge-port.c:165
+#: ../libnm-core/nm-setting-bridge-port.c:138
 #: ../libnm-core/nm-setting-team-port.c:110
 #, c-format
 msgid ""
@@ -8329,8 +8282,8 @@ msgstr ""
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "値 '%d' は <%d-%d> の範囲外です"
 
-#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:650
-#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
+#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:652
+#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
 #: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
 #: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
@@ -8352,34 +8305,34 @@ msgstr "接続タイプ '%s' は無効です"
 msgid "Unknown slave type '%s'"
 msgstr "不明なスレーブタイプ '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:978
+#: ../libnm-core/nm-setting-connection.c:979
 #: ../libnm-util/nm-setting-connection.c:887
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
 
-#: ../libnm-core/nm-setting-connection.c:999
+#: ../libnm-core/nm-setting-connection.c:1000
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "'%s' を '%s' なしで設定できません"
 
-#: ../libnm-core/nm-setting-connection.c:1013
+#: ../libnm-core/nm-setting-connection.c:1014
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "測定値 %d は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:1034
+#: ../libnm-core/nm-setting-connection.c:1035
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "プロパティータイプは '%s' に設定する必要があります"
 
-#: ../libnm-core/nm-setting-connection.c:1049
+#: ../libnm-core/nm-setting-connection.c:1050
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-connection.c:1059
+#: ../libnm-core/nm-setting-connection.c:1060
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -8388,6 +8341,13 @@ msgstr ""
 "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
 "'%s' に設定する必要があります"
 
+#: ../libnm-core/nm-setting-connection.c:1077
+#, fuzzy, c-format
+msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
+msgstr ""
+"'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
+"'%s' に設定する必要があります"
+
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
 msgstr "フラグは無効です"
@@ -8418,26 +8378,26 @@ msgstr "プロパティは無効です"
 msgid "property missing"
 msgstr "プロパティがありません"
 
-#: ../libnm-core/nm-setting-gsm.c:294 ../libnm-util/nm-setting-gsm.c:295
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "プロパティ値 '%s' が空白、または長過ぎます (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:326 ../libnm-util/nm-setting-gsm.c:327
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
 
-#: ../libnm-core/nm-setting-gsm.c:352 ../libnm-util/nm-setting-gsm.c:353
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
 
-#: ../libnm-core/nm-setting-gsm.c:397
+#: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "プロパティーが空、または間違ったサイズです"
 
-#: ../libnm-core/nm-setting-gsm.c:407
+#: ../libnm-core/nm-setting-gsm.c:425
 msgid "property must contain only digits"
 msgstr "プロパティーには数字のみ含めることができます"
 
@@ -8503,45 +8463,82 @@ msgstr "無効な IPv6 アドレスプレフィックス '%u'"
 msgid "Invalid routing metric '%s'"
 msgstr "無効なルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2278
+#: ../libnm-core/nm-setting-ip-config.c:1260
+#, fuzzy
+msgid "unknown attribute"
+msgstr "不明な設定名"
+
+#: ../libnm-core/nm-setting-ip-config.c:1270
+#, fuzzy, c-format
+msgid "invalid attribute type '%s'"
+msgstr "無効なパリティー値 '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:1281
+#, c-format
+msgid "attribute is not valid for a IPv4 route"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-config.c:1282
+#, c-format
+msgid "attribute is not valid for a IPv6 route"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-config.c:1298
+#: ../libnm-core/nm-setting-ip-config.c:1322
+#, fuzzy, c-format
+msgid "'%s' is not a valid IPv4 address"
+msgstr "'%s' は有効な IP アドレスではありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:1299
+#: ../libnm-core/nm-setting-ip-config.c:1323
+#, fuzzy, c-format
+msgid "'%s' is not a valid IPv6 address"
+msgstr "'%s' は有効な IP アドレスではありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:1313
+#, fuzzy, c-format
+msgid "invalid prefix %s"
+msgstr "無効なルート: %s"
+
+#: ../libnm-core/nm-setting-ip-config.c:2429
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS サーバーアドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2294
+#: ../libnm-core/nm-setting-ip-config.c:2445
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2306
+#: ../libnm-core/nm-setting-ip-config.c:2457
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP アドレスには無効なタイプの 'label' プロパティーがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2315
+#: ../libnm-core/nm-setting-ip-config.c:2466
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP アドレスには無効なラベル '%s' があります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2329
+#: ../libnm-core/nm-setting-ip-config.c:2480
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2338
+#: ../libnm-core/nm-setting-ip-config.c:2489
 msgid "gateway is invalid"
 msgstr "ゲートウェイが無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2352
+#: ../libnm-core/nm-setting-ip-config.c:2503
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルートは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2361
+#: ../libnm-core/nm-setting-ip-config.c:2512
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. ルートをデフォルトルートにすることはできません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2372
+#: ../libnm-core/nm-setting-ip-config.c:2523
 #, fuzzy, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
@@ -8613,8 +8610,9 @@ msgid "'%d' is not a valid tunnel mode"
 msgstr "'%d' は有効なトンネルモードではありません"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
-#: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:645
-#: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567
+#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
+#: ../libnm-util/nm-setting-vlan.c:567
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
@@ -8639,12 +8637,42 @@ msgstr "'%s' は有効なトンネルキーではありません"
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
 
-#: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:659
-#: ../libnm-util/nm-setting-vlan.c:580
+#: ../libnm-core/nm-setting-macsec.c:235
+msgid "the key is empty"
+msgstr ""
+
+#: ../libnm-core/nm-setting-macsec.c:246
+#, c-format
+msgid "the key must be %d characters"
+msgstr ""
+
+#: ../libnm-core/nm-setting-macsec.c:254
+#, fuzzy
+msgid "the key contains non-hexadecimal characters"
+msgstr "IV は 16進法でない数字を含んでいます。"
+
+#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "'%s' の値は '%s=%s' と一致しません"
+
+#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "プロパティ、'%s:%s' いずれも指定されていません"
 
+#: ../libnm-core/nm-setting-macsec.c:333
+#, c-format
+msgid "EAP key management requires '%s' setting presence"
+msgstr ""
+
+#: ../libnm-core/nm-setting-macsec.c:344
+#, c-format
+msgid "invalid port %d"
+msgstr ""
+
 #: ../libnm-core/nm-setting-macvlan.c:192
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
@@ -8719,10 +8747,67 @@ msgstr "'%s': 無効なユーザー ID"
 msgid "'%s': invalid group ID"
 msgstr "'%s': 無効なグループ ID"
 
-#: ../libnm-core/nm-setting-vlan.c:634 ../libnm-util/nm-setting-vlan.c:556
+#: ../libnm-core/nm-setting-user.c:111
+#, fuzzy
+msgid "missing key"
+msgstr "不明な設定"
+
+#: ../libnm-core/nm-setting-user.c:117
+#, fuzzy
+msgid "key is too long"
+msgstr "エラー: ssid が長すぎます。"
+
+#: ../libnm-core/nm-setting-user.c:122
+#, fuzzy
+msgid "key must be UTF8"
+msgstr "パスワードは UTF-8 である必要があります"
+
+#: ../libnm-core/nm-setting-user.c:145
+msgid "key requires a '.' for a namespace"
+msgstr ""
+
+#: ../libnm-core/nm-setting-user.c:158
+msgid "key cannot contain \"..\""
+msgstr ""
+
+#: ../libnm-core/nm-setting-user.c:163
+#, fuzzy
+msgid "key contains invalid characters"
+msgstr "IV は 16進法でない数字を含んでいます。"
+
+#: ../libnm-core/nm-setting-user.c:188
+#, fuzzy
+msgid "value is missing"
+msgstr "エラー: %s 引数がありません。"
+
+#: ../libnm-core/nm-setting-user.c:195
+#, fuzzy
+msgid "value is too large"
+msgstr "シークレット値が空でした"
+
+#: ../libnm-core/nm-setting-user.c:201
+#, fuzzy
+msgid "value is not valid UTF8"
+msgstr "file:// URI が有効な UTF-8 ではありません"
+
+#: ../libnm-core/nm-setting-user.c:338
+msgid "maximum number of user data entries reached"
+msgstr ""
+
+#: ../libnm-core/nm-setting-user.c:379
+#, fuzzy, c-format
+msgid "invalid key \"%s\": %s"
+msgstr "無効なルート: %s"
+
+#: ../libnm-core/nm-setting-user.c:383
+#, fuzzy, c-format
+msgid "invalid value for \"%s\": %s"
+msgstr "'%s' は有効な '%s' の値ではありません"
+
+#: ../libnm-core/nm-setting-user.c:398
 #, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "'%s' の値は '%s=%s' と一致しません"
+msgid "maximum number of user data entries reached (%u instead of %u)"
+msgstr ""
 
 #: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
@@ -8733,6 +8818,10 @@ msgstr "vlan id は 0〜4094 の範囲内である必要がありますが、%u
 msgid "flags are invalid"
 msgstr "フラグが無効です"
 
+#: ../libnm-core/nm-setting-vlan.c:691
+msgid "vlan setting should have a ethernet setting as well"
+msgstr ""
+
 #: ../libnm-core/nm-setting-vpn.c:460
 #, c-format
 msgid "secret was empty"
@@ -8747,7 +8836,7 @@ msgstr "設定に空の名前のシークレットが含まれていました"
 msgid "secret value was empty"
 msgstr "シークレット値が空でした"
 
-#: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
+#: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1785
 msgid "not a secret property"
 msgstr "シークレットプロパティーではありません"
 
@@ -8775,38 +8864,38 @@ msgstr "'%s' は有効な IP%c アドレスではありません"
 msgid "%d is greater than local port max %d"
 msgstr "%d はローカルポートの最大 %d よりも大きいです"
 
-#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
 #, fuzzy, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' は有効な Ethernet ポート値ではありません"
 
-#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "'%s' は有効な二重値ではありません"
 
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "無効な '%s' またはその値 '%s' です"
 
-#: ../libnm-core/nm-setting-wired.c:736
+#: ../libnm-core/nm-setting-wired.c:738
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグです"
 
-#: ../libnm-core/nm-setting-wired.c:745
+#: ../libnm-core/nm-setting-wired.c:747
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "Wake-on-LAN パスワードはマジックパケットモードでのみ使用できます"
 
-#: ../libnm-core/nm-setting-wired.c:768
+#: ../libnm-core/nm-setting-wired.c:770
 msgid "when link autonegotiation is enabled no duplex value is accepted"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wired.c:776
+#: ../libnm-core/nm-setting-wired.c:778
 msgid "when link autonegotiation is enabled speed should be 0"
 msgstr ""
 
-#: ../libnm-core/nm-setting-wired.c:786
+#: ../libnm-core/nm-setting-wired.c:788
 #, fuzzy
 msgid "both speed and duplex are required for static link configuration"
 msgstr "VPN サービスは無効な設定を返しました"
@@ -8868,139 +8957,174 @@ msgstr "無効なキー/証明書値"
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr ""
 
-#: ../libnm-core/nm-setting.c:837
+#: ../libnm-core/nm-setting.c:838
 #, c-format
 msgid "duplicate property"
 msgstr "重複するプロパティー"
 
-#: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
+#: ../libnm-core/nm-setting.c:866 ../libnm-core/nm-setting.c:913
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
 
-#: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
+#: ../libnm-core/nm-setting.c:885 ../libnm-core/nm-setting.c:899
 #, c-format
 msgid "failed to set property: %s"
 msgstr "プロパティーの設定に失敗しました: %s"
 
-#: ../libnm-core/nm-setting.c:926
+#: ../libnm-core/nm-setting.c:927
 #, c-format
 msgid "can not set property: %s"
 msgstr "プロパティーを設定できません: %s"
 
-#: ../libnm-core/nm-setting.c:942
+#: ../libnm-core/nm-setting.c:943
 #, c-format
 msgid "unknown property"
 msgstr "不明なプロパティー"
 
-#: ../libnm-core/nm-setting.c:1682
+#: ../libnm-core/nm-setting.c:1683
 msgid "secret not found"
 msgstr "シークレットが見つかりません"
 
-#: ../libnm-core/nm-setting.c:1774
+#: ../libnm-core/nm-setting.c:1775
 msgid "secret is not set"
 msgstr "シークレットが設定されていません"
 
-#: ../libnm-core/nm-utils.c:2488
+#: ../libnm-core/nm-utils.c:2444
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
 
-#: ../libnm-core/nm-utils.c:2497
+#: ../libnm-core/nm-utils.c:2453
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2508
+#: ../libnm-core/nm-utils.c:2464
 #, fuzzy, c-format
 msgid "invalid file owner %d for %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../libnm-core/nm-utils.c:2519
+#: ../libnm-core/nm-utils.c:2475
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s のファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:2529
+#: ../libnm-core/nm-utils.c:2485
 #, c-format
 msgid "reject %s"
 msgstr "%s の拒否"
 
-#: ../libnm-core/nm-utils.c:2549
+#: ../libnm-core/nm-utils.c:2505
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パスが絶対パスではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2563
+#: ../libnm-core/nm-utils.c:2519
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイルが存在しません (%s)"
 
-#: ../libnm-core/nm-utils.c:2571
+#: ../libnm-core/nm-utils.c:2527
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグインが有効なファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2581
+#: ../libnm-core/nm-utils.c:2537
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブはサポートされていません (%s)"
 
-#: ../libnm-core/nm-utils.c:2663 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2619 ../libnm-util/nm-utils.c:1803
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" バイナリーを見つけることができませんでした"
 
-#: ../libnm-core/nm-utils.c:3709
+#: ../libnm-core/nm-utils.c:3665
 #, fuzzy, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-utils.c:3724
+#: ../libnm-core/nm-utils.c:3680
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3758
+#: ../libnm-core/nm-utils.c:3714
 #, fuzzy
 msgid "interface name is too short"
 msgstr "インターフェース名 [*]: "
 
-#: ../libnm-core/nm-utils.c:3764
+#: ../libnm-core/nm-utils.c:3720
 msgid "interface name is longer than 15 characters"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:3770
+#: ../libnm-core/nm-utils.c:3726
 #, fuzzy
 msgid "interface name is reserved"
 msgstr "インターフェース名と UUID が’必要です\n"
 
-#: ../libnm-core/nm-utils.c:3777
+#: ../libnm-core/nm-utils.c:3733
 msgid "interface name contains an invalid character"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+#: ../libnm-core/nm-utils.c:4534 ../libnm-core/nm-utils.c:4668
 msgid "value is NULL"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+#: ../libnm-core/nm-utils.c:4534 ../libnm-core/nm-utils.c:4668
 #, fuzzy
 msgid "value is empty"
 msgstr "シークレット値が空でした"
 
-#: ../libnm-core/nm-utils.c:4504
+#: ../libnm-core/nm-utils.c:4543
 #, fuzzy, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "無効なオプション '%s'"
 
-#: ../libnm-core/nm-utils.c:4516 ../libnm-core/nm-utils.c:4648
+#: ../libnm-core/nm-utils.c:4555 ../libnm-core/nm-utils.c:4687
 msgid "is not a JSON object"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:4618
+#: ../libnm-core/nm-utils.c:4657
 msgid "not valid utf-8"
 msgstr ""
 
+#: ../libnm-core/nm-utils.c:4782 ../libnm-core/nm-utils.c:4800
+#, c-format
+msgid "unterminated escape sequence"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4810
+#, c-format
+msgid "missing key-value separator '%c'"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4827
+#, fuzzy, c-format
+msgid "unknown attribute '%s'"
+msgstr "不明なデバイス '%s' です。"
+
+#: ../libnm-core/nm-utils.c:4837
+#, fuzzy, c-format
+msgid "invalid uint32 value '%s' for attribute '%s'"
+msgstr "無効なオプション '%s'、またはその値 '%s' です"
+
+#: ../libnm-core/nm-utils.c:4846
+#, fuzzy, c-format
+msgid "invalid uint8 value '%s' for attribute '%s'"
+msgstr "無効なオプション '%s'、またはその値 '%s' です"
+
+#: ../libnm-core/nm-utils.c:4859
+#, fuzzy, c-format
+msgid "invalid boolean value '%s' for attribute '%s'"
+msgstr "無効なオプション '%s'、またはその値 '%s' です"
+
+#: ../libnm-core/nm-utils.c:4867
+#, c-format
+msgid "unsupported attribute '%s' of type '%s'"
+msgstr ""
+
 #: ../libnm-core/nm-vpn-editor-plugin.c:296
 #, fuzzy, c-format
 msgid "cannot load plugin \"%s\": %s"
@@ -9083,51 +9207,51 @@ msgstr "VPN プラグイン情報の不明な名前"
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報の不明なサービス"
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1665
+#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1621
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1667
+#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1623
 msgid "OLPC Mesh"
 msgstr "OLPC メッシュ"
 
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1669
+#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1625
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1683
+#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1639
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1685
+#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1641
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1687
+#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1643
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1689
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1645
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1691
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1647
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1693
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1649
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1725
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1685
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1756
+#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1716
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1758
+#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1718
 msgid "USB"
 msgstr "USB"
 
@@ -9137,8 +9261,8 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:1852 ../libnm/nm-device.c:1871
+#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm/nm-device.c:1813 ../libnm/nm-device.c:1832
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -9264,6 +9388,15 @@ msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "デバイスには接続に必要な Bluetooth 機能がありません。"
 
+#: ../libnm/nm-device-dummy.c:46
+#, fuzzy
+msgid "The connection was not a dummy connection."
+msgstr "接続はモデム接続ではありませんでした。"
+
+#: ../libnm/nm-device-dummy.c:53 ../libnm/nm-device-generic.c:97
+msgid "The connection did not specify an interface name."
+msgstr "接続でインターフェース名が指定されませんでした。"
+
 #: ../libnm/nm-device-ethernet.c:206
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "接続は Ethernet または PPPoE 接続ではありませんでした。"
@@ -9295,10 +9428,6 @@ msgstr "デバイス MAC (%s) は接続によりブラックリスト化され
 msgid "The connection was not a generic connection."
 msgstr "接続は汎用的な接続ではありませんでした。"
 
-#: ../libnm/nm-device-generic.c:97
-msgid "The connection did not specify an interface name."
-msgstr "接続でインターフェース名が指定されませんでした。"
-
 #: ../libnm/nm-device-tun.c:208
 msgid "The connection was not a tun connection."
 msgstr "接続は tun 接続ではありませんでした。"
@@ -9385,12 +9514,20 @@ msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません
 msgid "The connection was not a WiMAX connection."
 msgstr "接続は WiMAX 接続ではありませんでした。"
 
-#: ../libnm/nm-device.c:2583
+#: ../libnm/nm-device.c:1651
+msgid "MACsec"
+msgstr ""
+
+#: ../libnm/nm-device.c:1653
+msgid "Dummy"
+msgstr ""
+
+#: ../libnm/nm-device.c:2544
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続は有効ではありませんでした: %s"
 
-#: ../libnm/nm-device.c:2592
+#: ../libnm/nm-device.c:2553
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
@@ -9555,18 +9692,18 @@ msgid "System policy prevents enabling or disabling device statistics"
 msgstr ""
 "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
 
-#: ../shared/nm-utils/nm-shared-utils.c:264
+#: ../shared/nm-utils/nm-shared-utils.c:312
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:271
+#: ../shared/nm-utils/nm-shared-utils.c:319
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:278
+#: ../shared/nm-utils/nm-shared-utils.c:326
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9574,19 +9711,19 @@ msgstr ""
 "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
 "ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:286
+#: ../shared/nm-utils/nm-shared-utils.c:334
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
 "ありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:295
+#: ../shared/nm-utils/nm-shared-utils.c:343
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:306
+#: ../shared/nm-utils/nm-shared-utils.c:354
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9605,43 +9742,43 @@ msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:171 ../src/main.c:306
+#: ../src/main.c:176 ../src/main.c:315
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定の読み込みに失敗しました: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:185 ../src/nm-iface-helper.c:302
+#: ../src/main.c:190 ../src/nm-iface-helper.c:309
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:186 ../src/nm-iface-helper.c:303
+#: ../src/main.c:191 ../src/nm-iface-helper.c:310
 msgid "Don't become a daemon"
 msgstr "デーモンにしない"
 
-#: ../src/main.c:187 ../src/nm-iface-helper.c:305
+#: ../src/main.c:192 ../src/nm-iface-helper.c:312
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] のいずれか"
 
-#: ../src/main.c:189 ../src/nm-iface-helper.c:307
+#: ../src/main.c:194 ../src/nm-iface-helper.c:314
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
 
-#: ../src/main.c:191 ../src/nm-iface-helper.c:309
+#: ../src/main.c:196 ../src/nm-iface-helper.c:316
 msgid "Make all warnings fatal"
 msgstr "すべての警告を致命的にする"
 
-#: ../src/main.c:192
+#: ../src/main.c:197
 msgid "Specify the location of a PID file"
 msgstr "PID ファイルの場所を指定する"
 
-#: ../src/main.c:194
+#: ../src/main.c:199
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager の設定を表示して終了する"
 
-#: ../src/main.c:204
+#: ../src/main.c:209
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9653,27 +9790,27 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:291 ../src/main-utils.c:283 ../src/nm-iface-helper.c:407
+#: ../src/main.c:300 ../src/main-utils.c:286 ../src/nm-iface-helper.c:414
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:296 ../src/nm-iface-helper.c:412
+#: ../src/main.c:305 ../src/nm-iface-helper.c:419
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:321
+#: ../src/main.c:330
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "設定ファイルにエラーが発生しました: %s\n"
 
-#: ../src/main.c:326
+#: ../src/main.c:335
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "設定ファイルにある未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:337 ../src/nm-iface-helper.c:422
+#: ../src/main.c:346 ../src/nm-iface-helper.c:429
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
@@ -9693,26 +9830,26 @@ msgstr "%s への書き込みに失敗しました: %s\n"
 msgid "Closing %s failed: %s\n"
 msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/main-utils.c:148 ../src/main-utils.c:156
+#: ../src/main-utils.c:148 ../src/main-utils.c:159
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "'%s' を作成できません: %s"
 
-#: ../src/main-utils.c:209
+#: ../src/main-utils.c:212
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s はすでに実行中です (pid %ld)\n"
 
-#: ../src/main-utils.c:219
+#: ../src/main-utils.c:222
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "%s! を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:252
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:278
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:261
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:288
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -9721,7 +9858,7 @@ msgstr ""
 "# %s からマージされています\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:209
+#: ../src/devices/bluetooth/nm-bluez-device.c:210
 #, c-format
 msgid "%s Network"
 msgstr "%s ネットワーク"
@@ -9761,9 +9898,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "不明な/未処理の Bluetooth 接続タイプ"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:347
-#: ../src/devices/nm-device-ethernet.c:1508
-#: ../src/devices/nm-device-infiniband.c:204
-#: ../src/devices/wifi/nm-device-wifi.c:910
+#: ../src/devices/nm-device-ethernet.c:1454
+#: ../src/devices/nm-device-infiniband.c:210
+#: ../src/devices/wifi/nm-device-wifi.c:928
 msgid "connection does not match device"
 msgstr "接続がデバイスに一致しません"
 
@@ -9775,11 +9912,16 @@ msgstr "ボンド接続"
 msgid "Bridge connection"
 msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-ethernet.c:1489
+#: ../src/devices/nm-device-dummy.c:70
+#, fuzzy
+msgid "Dummy connection"
+msgstr "ADSL 接続"
+
+#: ../src/devices/nm-device-ethernet.c:1435
 msgid "PPPoE connection"
 msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1489
+#: ../src/devices/nm-device-ethernet.c:1435
 msgid "Wired connection"
 msgstr "有線接続"
 
@@ -9800,7 +9942,7 @@ msgstr "MACVLAN 接続"
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/team/nm-device-team.c:134
+#: ../src/devices/team/nm-device-team.c:135
 msgid "Team connection"
 msgstr "team 接続"
 
@@ -9808,7 +9950,7 @@ msgstr "team 接続"
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../src/devices/wifi/nm-device-wifi.c:877
+#: ../src/devices/wifi/nm-device-wifi.c:895
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "WPA アドホックはカーネルバグのため無効になりました"
 
@@ -9972,134 +10114,134 @@ msgstr "AP セキュリティー情報の決定に失敗しました。"
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
 
-#: ../src/nm-config.c:466
+#: ../src/nm-config.c:486
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:467
+#: ../src/nm-config.c:487
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:468
+#: ../src/nm-config.c:488
 msgid "System config directory location"
 msgstr "システム設定ディレクトリーの場所"
 
-#: ../src/nm-config.c:469
+#: ../src/nm-config.c:489
 msgid "Internal config file location"
 msgstr "内部設定ファイルの場所"
 
-#: ../src/nm-config.c:470
+#: ../src/nm-config.c:490
 msgid "State file location"
 msgstr "状態ファイルの場所"
 
-#: ../src/nm-config.c:471
+#: ../src/nm-config.c:491
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デバイスの状態ファイル"
 
-#: ../src/nm-config.c:472
+#: ../src/nm-config.c:492
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを「,」で区切った一覧"
 
-#: ../src/nm-config.c:473
+#: ../src/nm-config.c:493
 msgid "Quit after initial configuration"
 msgstr "初期設定後に終了する"
 
-#: ../src/nm-config.c:474 ../src/nm-iface-helper.c:304
+#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:311
 msgid "Don't become a daemon, and log to stderr"
 msgstr "デーモンにせず、stderr にログ記録する"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:477
+#: ../src/nm-config.c:497
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:478
+#: ../src/nm-config.c:498
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:479
+#: ../src/nm-config.c:499
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:291
 msgid "The interface to manage"
 msgstr "管理するインターフェース"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:292
 msgid "Connection UUID"
 msgstr "接続 UUID"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:293
 #, fuzzy
 msgid "Connection Token for Stable IDs"
 msgstr "接続プロファイルの詳細"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:294
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "IPv6 SLAAC を管理するかどうか"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:295
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:296
 msgid "Use an IPv6 temporary privacy address"
 msgstr "IPv6 一時プライバシーアドレスの使用"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:297
 msgid "Current DHCPv4 address"
 msgstr "現在の DHCPv4 アドレス"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:298
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:299
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "16 進エンコードされた DHCPv4 クライアント ID"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:300
 msgid "Hostname to send to DHCP server"
 msgstr "DHCP サーバーに送信するホスト名"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:300
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:301
 msgid "FQDN to send to DHCP server"
 msgstr "DHCP サーバーに送信する FQDN"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:301
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:295
+#: ../src/nm-iface-helper.c:302
 msgid "Route priority for IPv4"
 msgstr "IPv4 のルート優先度"
 
-#: ../src/nm-iface-helper.c:295
+#: ../src/nm-iface-helper.c:302
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:296
+#: ../src/nm-iface-helper.c:303
 msgid "Route priority for IPv6"
 msgstr "IPv6 のルート優先度"
 
-#: ../src/nm-iface-helper.c:296
+#: ../src/nm-iface-helper.c:303
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:297
+#: ../src/nm-iface-helper.c:304
 msgid "Hex-encoded Interface Identifier"
 msgstr "16 進エンコードされたインターフェース ID"
 
-#: ../src/nm-iface-helper.c:298
+#: ../src/nm-iface-helper.c:305
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC アドレス生成モード"
 
-#: ../src/nm-iface-helper.c:299
+#: ../src/nm-iface-helper.c:306
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -10107,7 +10249,7 @@ msgstr ""
 "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照して"
 "ください"
 
-#: ../src/nm-iface-helper.c:319
+#: ../src/nm-iface-helper.c:326
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -10115,31 +10257,40 @@ msgstr ""
 "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
 "ドアロンプロセスです。"
 
-#: ../src/nm-iface-helper.c:388
+#: ../src/nm-iface-helper.c:395
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "インターフェース名と UUID が’必要です\n"
 
-#: ../src/nm-iface-helper.c:394
+#: ../src/nm-iface-helper.c:401
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
 
-#: ../src/nm-iface-helper.c:456
+#: ../src/nm-iface-helper.c:462
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効な IID %s\n"
 
-#: ../src/nm-logging.c:266
+#: ../src/nm-logging.c:267
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:368
+#: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:107
-msgid "System"
-msgstr "システム"
+#, fuzzy
+#~ msgid "unrecognized option '%s'"
+#~ msgstr "無効なオプション '%s'"
+
+#~ msgid "Option '--terse' requires specifying '--fields'"
+#~ msgstr "オプション '--terse' には '--fields' の指定が必要です"
+
+#~ msgid ""
+#~ "Option '--terse' requires specific '--fields' option values , not '%s'"
+#~ msgstr ""
+#~ "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' で"
+#~ "はありません"