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.po5611
1 files changed, 2932 insertions, 2679 deletions
diff --git a/po/ja.po b/po/ja.po
index 127d5926..35f7d47d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,20 +5,22 @@
 # Satoru SATOH <ssato@redhat.com>, 2005-2007.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
+# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
+# Lubomir Rintel <lkundrak@v3.sk>, 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-29 14:24+0530\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-07-05 08:38+0000\n"
+"POT-Creation-Date: 2017-01-16 16:07+0100\n"
+"PO-Revision-Date: 2017-01-16 09:13-0500\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -47,9 +49,10 @@ msgid ""
 msgstr ""
 "使い方: nmcli agent secret { help }\n"
 "\n"
-"nmcli を NetworkManager シークレットエージェントとして実行します。NetworkManager "
-"がパスワードを必要とする場合は、登録されたエージェントにパスワードを尋ねます。このコマンドにより、nmcli "
-"が引き続き実行され、パスワードが必要な場合は、ユーザーにパスワードを尋ねます。\n"
+"nmcli を NetworkManager シークレットエージェントとして実行します。"
+"NetworkManager がパスワードを必要とする場合は、登録されたエージェントにパス"
+"ワードを尋ねます。このコマンドにより、nmcli が引き続き実行され、パスワードが"
+"必要な場合は、ユーザーにパスワードを尋ねます。\n"
 "\n"
 
 #: ../clients/cli/agent.c:57
@@ -66,7 +69,8 @@ msgstr ""
 "使い方: nmcli agent polkit { help }\n"
 "\n"
 "nmcli をユーザーセッションの polkit アクションとして登録します。\n"
-"polkit デーモンが承認を必要とする場合、nmcli はユーザーに尋ね、応答を polkit に返します。\n"
+"polkit デーモンが承認を必要とする場合、nmcli はユーザーに尋ね、応答を polkit "
+"に返します。\n"
 "\n"
 
 #: ../clients/cli/agent.c:67
@@ -79,585 +83,690 @@ msgid ""
 msgstr ""
 "使い方: nmcli agent all { help }\n"
 "\n"
-"nmcli を NetworkManager シークレットと polkit エージェントとして実行します。\n"
+"nmcli を NetworkManager シークレットと polkit エージェントとして実行しま"
+"す。\n"
 "\n"
 
-#: ../clients/cli/agent.c:149
+#: ../clients/cli/agent.c:156
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr "nmcli は NetworkManager のシークレットエージェントとして適切に登録されました。\n"
+msgstr ""
+"nmcli は NetworkManager のシークレットエージェントとして適切に登録されまし"
+"た。\n"
 
-#: ../clients/cli/agent.c:151
+#: ../clients/cli/agent.c:158
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "エラー: シークレットエージェントの初期化に失敗しました"
 
-#: ../clients/cli/agent.c:166
+#: ../clients/cli/agent.c:176
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
 
-#: ../clients/cli/agent.c:174
+#: ../clients/cli/agent.c:184
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
-#, c-format
-msgid "Error: NetworkManager is not running."
-msgstr "エラー: NetworkManager が起動していません。"
-
-#: ../clients/cli/agent.c:242
-#, c-format
-msgid "Error: 'agent' command '%s' is not valid."
-msgstr "エラー: 'agent' コマンド '%s' は無効です。"
-
-#: ../clients/cli/common.c:38 ../clients/cli/common.c:51
-#: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
+#: ../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
 msgid "GROUP"
 msgstr "グループ"
 
 #. 0
-#: ../clients/cli/common.c:39 ../clients/cli/common.c:60
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ADDRESS"
 msgstr "アドレス"
 
 #. 1
 #. 2
-#: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
+#: ../clients/cli/connections.c:236
 msgid "GATEWAY"
 msgstr "ゲートウェイ"
 
 #. 2
-#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
 msgid "ROUTE"
 msgstr "ルート"
 
 #. 3
-#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
+#: ../clients/cli/common.c:44 ../clients/cli/common.c:65
 msgid "DNS"
 msgstr "DNS"
 
 #. 4
-#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
+#: ../clients/cli/common.c:45 ../clients/cli/common.c:66
 msgid "DOMAIN"
 msgstr "ドメイン"
 
 #. 5
-#: ../clients/cli/common.c:44
+#: ../clients/cli/common.c:46
 msgid "WINS"
 msgstr "WINS"
 
 #. 0
-#: ../clients/cli/common.c:52 ../clients/cli/common.c:72
+#: ../clients/cli/common.c:54 ../clients/cli/common.c:74
 msgid "OPTION"
 msgstr "オプション"
 
-#: ../clients/cli/common.c:376 ../clients/cli/common.c:436
+#: ../clients/cli/common.c:378 ../clients/cli/common.c:440
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
 
-#: ../clients/cli/common.c:384
+#: ../clients/cli/common.c:386
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "無効な IP アドレス: %s"
 
-#: ../clients/cli/common.c:448
+#: ../clients/cli/common.c:452
 #, c-format
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
-msgstr "ルートの 2 番目の部分 ('%s') は、ネクストホップアドレスでもなく、メトリックでもありません"
+msgstr ""
+"ルートの 2 番目の部分 ('%s') は、ネクストホップアドレスでもなく、メトリックで"
+"もありません"
 
-#: ../clients/cli/common.c:457
+#: ../clients/cli/common.c:462
 #, c-format
 msgid "invalid metric '%s'"
 msgstr "無効なメトリック '%s'"
 
-#: ../clients/cli/common.c:465
+#: ../clients/cli/common.c:471
 #, c-format
 msgid "invalid route: %s"
 msgstr "無効なルート: %s"
 
-#: ../clients/cli/common.c:477
+#: ../clients/cli/common.c:483
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
 
-#: ../clients/cli/common.c:494
+#: ../clients/cli/common.c:500
 msgid "unmanaged"
 msgstr "管理無し"
 
-#: ../clients/cli/common.c:496
+#: ../clients/cli/common.c:502
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
+#: ../clients/cli/common.c:504 ../clients/cli/general.c:248
 msgid "disconnected"
 msgstr "切断済み"
 
-#: ../clients/cli/common.c:500
+#: ../clients/cli/common.c:506
 msgid "connecting (prepare)"
 msgstr "接続中(準備)"
 
-#: ../clients/cli/common.c:502
+#: ../clients/cli/common.c:508
 msgid "connecting (configuring)"
 msgstr "接続中(設定中)"
 
-#: ../clients/cli/common.c:504
+#: ../clients/cli/common.c:510
 msgid "connecting (need authentication)"
 msgstr "接続中(認証が必要)"
 
-#: ../clients/cli/common.c:506
+#: ../clients/cli/common.c:512
 msgid "connecting (getting IP configuration)"
 msgstr "接続中(IP 設定を取得中)"
 
-#: ../clients/cli/common.c:508
+#: ../clients/cli/common.c:514
 msgid "connecting (checking IP connectivity)"
 msgstr "接続中(IP の接続性チェック)"
 
-#: ../clients/cli/common.c:510
+#: ../clients/cli/common.c:516
 msgid "connecting (starting secondary connections)"
 msgstr "接続中(セカンダリ接続を開始)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
+#: ../clients/cli/common.c:518 ../clients/cli/general.c:244
 msgid "connected"
 msgstr "接続済み"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:520 ../clients/cli/connections.c:628
 msgid "deactivating"
 msgstr "停止中"
 
-#: ../clients/cli/common.c:516
+#: ../clients/cli/common.c:522
 msgid "connection failed"
 msgstr "接続に失敗"
 
-#: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
-#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
-#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
-#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
-#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../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
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
-#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
-#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
-#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
-#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
-#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
-#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
-#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
-#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../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
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
-#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
-#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
-#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
-#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
-#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
-#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
-#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../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
 msgid "no"
 msgstr "いいえ"
 
-#: ../clients/cli/common.c:531
+#: ../clients/cli/common.c:537
 msgid "yes (guessed)"
 msgstr "はい (推測)"
 
-#: ../clients/cli/common.c:533
+#: ../clients/cli/common.c:539
 msgid "no (guessed)"
 msgstr "いいえ (推測)"
 
-#: ../clients/cli/common.c:544
+#: ../clients/cli/common.c:550
 msgid "No reason given"
 msgstr "原因不明"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:553 ../clients/cli/connections.c:3320
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../clients/cli/common.c:550
+#: ../clients/cli/common.c:556
 msgid "Device is now managed"
 msgstr "デバイスが管理下に置かれました"
 
-#: ../clients/cli/common.c:553
+#: ../clients/cli/common.c:559
 msgid "Device is now unmanaged"
 msgstr "デバイスが管理下から外れました"
 
-#: ../clients/cli/common.c:556
+#: ../clients/cli/common.c:562
 msgid "The device could not be readied for configuration"
 msgstr "デバイスの設定準備ができませんでした"
 
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:565
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
+msgstr ""
+"IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
 
-#: ../clients/cli/common.c:562
+#: ../clients/cli/common.c:568
 msgid "The IP configuration is no longer valid"
 msgstr "この IP 設定は無効になりました"
 
-#: ../clients/cli/common.c:565
+#: ../clients/cli/common.c:571
 msgid "Secrets were required, but not provided"
 msgstr "秘密が必要でしたが入力されませんでした"
 
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:574
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X サプリカントが切断されました"
 
-#: ../clients/cli/common.c:571
+#: ../clients/cli/common.c:577
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X サプリカントの設定に失敗しました"
 
-#: ../clients/cli/common.c:574
+#: ../clients/cli/common.c:580
 msgid "802.1X supplicant failed"
 msgstr "802.1X サプリカントが失敗しました"
 
-#: ../clients/cli/common.c:577
+#: ../clients/cli/common.c:583
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
 
-#: ../clients/cli/common.c:580
+#: ../clients/cli/common.c:586
 msgid "PPP service failed to start"
 msgstr "PPP サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:583
+#: ../clients/cli/common.c:589
 msgid "PPP service disconnected"
 msgstr "PPP サービスの接続が切断されました"
 
-#: ../clients/cli/common.c:586
+#: ../clients/cli/common.c:592
 msgid "PPP failed"
 msgstr "PPP の失敗"
 
-#: ../clients/cli/common.c:589
+#: ../clients/cli/common.c:595
 msgid "DHCP client failed to start"
 msgstr "DHCP クライアントの開始に失敗しました"
 
-#: ../clients/cli/common.c:592
+#: ../clients/cli/common.c:598
 msgid "DHCP client error"
 msgstr "DHCP クライアントエラー"
 
-#: ../clients/cli/common.c:595
+#: ../clients/cli/common.c:601
 msgid "DHCP client failed"
 msgstr "DHCP クライアントの失敗"
 
-#: ../clients/cli/common.c:598
+#: ../clients/cli/common.c:604
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:601
+#: ../clients/cli/common.c:607
 msgid "Shared connection service failed"
 msgstr "共有接続サービスの失敗"
 
-#: ../clients/cli/common.c:604
+#: ../clients/cli/common.c:610
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの開始に失敗しました"
 
-#: ../clients/cli/common.c:607
+#: ../clients/cli/common.c:613
 msgid "AutoIP service error"
 msgstr "AutoIP サービスエラー"
 
-#: ../clients/cli/common.c:610
+#: ../clients/cli/common.c:616
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスの失敗"
 
-#: ../clients/cli/common.c:613
+#: ../clients/cli/common.c:619
 msgid "The line is busy"
 msgstr "回線が使用中です"
 
-#: ../clients/cli/common.c:616
+#: ../clients/cli/common.c:622
 msgid "No dial tone"
 msgstr "ダイアル音がありません"
 
-#: ../clients/cli/common.c:619
+#: ../clients/cli/common.c:625
 msgid "No carrier could be established"
 msgstr "確立できるキャリアがありませんでした"
 
-#: ../clients/cli/common.c:622
+#: ../clients/cli/common.c:628
 msgid "The dialing request timed out"
 msgstr "ダイアル要求がタイムアウトしました"
 
-#: ../clients/cli/common.c:625
+#: ../clients/cli/common.c:631
 msgid "The dialing attempt failed"
 msgstr "ダイアルの試行に失敗しました"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:634
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
-#: ../clients/cli/common.c:631
+#: ../clients/cli/common.c:637
 msgid "Failed to select the specified APN"
 msgstr "指定された APN の選択に失敗しました"
 
-#: ../clients/cli/common.c:634
+#: ../clients/cli/common.c:640
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:643
 msgid "Network registration denied"
 msgstr "ネットワークの登録が拒否されました"
 
-#: ../clients/cli/common.c:640
+#: ../clients/cli/common.c:646
 msgid "Network registration timed out"
 msgstr "ネットワークの登録がタイムアウトしました"
 
-#: ../clients/cli/common.c:643
+#: ../clients/cli/common.c:649
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
-#: ../clients/cli/common.c:646
+#: ../clients/cli/common.c:652
 msgid "PIN check failed"
 msgstr "PIN 確認に失敗しました"
 
-#: ../clients/cli/common.c:649
+#: ../clients/cli/common.c:655
 msgid "Necessary firmware for the device may be missing"
 msgstr "このデバイスに必要なファームウェアがない可能性があります"
 
-#: ../clients/cli/common.c:652
+#: ../clients/cli/common.c:658
 msgid "The device was removed"
 msgstr "このデバイスは削除されました"
 
-#: ../clients/cli/common.c:655
+#: ../clients/cli/common.c:661
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager がスリープ状態に入りました"
 
-#: ../clients/cli/common.c:658
+#: ../clients/cli/common.c:664
 msgid "The device's active connection disappeared"
 msgstr "このデバイスのアクティブな接続が消滅しました"
 
-#: ../clients/cli/common.c:661
+#: ../clients/cli/common.c:667
 msgid "Device disconnected by user or client"
 msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
 
-#: ../clients/cli/common.c:664
+#: ../clients/cli/common.c:670
 msgid "Carrier/link changed"
 msgstr "キャリア/リンクが変更されました"
 
-#: ../clients/cli/common.c:667
+#: ../clients/cli/common.c:673
 msgid "The device's existing connection was assumed"
 msgstr "デバイスの既存の接続とみなされました"
 
-#: ../clients/cli/common.c:670
+#: ../clients/cli/common.c:676
 msgid "The supplicant is now available"
 msgstr "サプリカントが使用できるようになりました"
 
-#: ../clients/cli/common.c:673
+#: ../clients/cli/common.c:679
 msgid "The modem could not be found"
 msgstr "モデムが見つかりませんでした"
 
-#: ../clients/cli/common.c:676
+#: ../clients/cli/common.c:682
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
 
-#: ../clients/cli/common.c:679
+#: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM モデムの SIM カードが挿入されていません"
 
-#: ../clients/cli/common.c:682
+#: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM モデムの SIM PIN が必要です"
 
-#: ../clients/cli/common.c:685
+#: ../clients/cli/common.c:691
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM モデムの SIM PUK が必要です"
 
-#: ../clients/cli/common.c:688
+#: ../clients/cli/common.c:694
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM モデムの SIM が間違っています"
 
-#: ../clients/cli/common.c:691
+#: ../clients/cli/common.c:697
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand デバイスでは接続モードに対応していません"
 
-#: ../clients/cli/common.c:694
+#: ../clients/cli/common.c:700
 msgid "A dependency of the connection failed"
 msgstr "接続依存性の失敗"
 
-#: ../clients/cli/common.c:697
+#: ../clients/cli/common.c:703
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
 
-#: ../clients/cli/common.c:700
+#: ../clients/cli/common.c:706
 msgid "ModemManager is unavailable"
 msgstr "ModemManager は使用できません"
 
-#: ../clients/cli/common.c:703
+#: ../clients/cli/common.c:709
 msgid "The Wi-Fi network could not be found"
 msgstr "Wi-Fi ネットワークが見つかりませんでした"
 
-#: ../clients/cli/common.c:706
+#: ../clients/cli/common.c:712
 msgid "A secondary connection of the base connection failed"
 msgstr "ベース接続のセカンダリ接続に失敗しました"
 
-#: ../clients/cli/common.c:709
+#: ../clients/cli/common.c:715
 msgid "DCB or FCoE setup failed"
 msgstr "DCB または FCoE のセットアップに失敗しました"
 
-#: ../clients/cli/common.c:712
+#: ../clients/cli/common.c:718
 msgid "teamd control failed"
 msgstr "teamd の制御に失敗しました"
 
-#: ../clients/cli/common.c:715
+#: ../clients/cli/common.c:721
 msgid "Modem failed or no longer available"
 msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
 
-#: ../clients/cli/common.c:718
+#: ../clients/cli/common.c:724
 msgid "Modem now ready and available"
 msgstr "モデムが準備されましたので利用可能です"
 
-#: ../clients/cli/common.c:721
+#: ../clients/cli/common.c:727
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN が間違っています"
 
-#: ../clients/cli/common.c:724
+#: ../clients/cli/common.c:730
 msgid "New connection activation was enqueued"
 msgstr "新規接続アクティベーションがキューに格納されました"
 
-#: ../clients/cli/common.c:727
+#: ../clients/cli/common.c:733
 msgid "The device's parent changed"
 msgstr "デバイスの親が変更されました"
 
-#: ../clients/cli/common.c:730
+#: ../clients/cli/common.c:736
 msgid "The device parent's management changed"
 msgstr "デバイスの親の管理が変更されました"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
-#: ../libnm/nm-device.c:1839
+#: ../clients/cli/common.c:740 ../libnm-glib/nm-device.c:1898
+#: ../libnm/nm-device.c:1700
 msgid "Unknown"
 msgstr "不明"
 
-#: ../clients/cli/common.c:776
+#: ../clients/cli/common.c:782
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "無効な優先度マップ '%s'"
 
-#: ../clients/cli/common.c:783 ../clients/cli/common.c:789
+#: ../clients/cli/common.c:789 ../clients/cli/common.c:795
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
 
-#: ../clients/cli/common.c:856
+#: ../clients/cli/common.c:869
+#, c-format
+msgid "cannot read team config from file '%s'"
+msgstr ""
+
+#: ../clients/cli/common.c:876
 #, c-format
-msgid "'%s' is not a valid team configuration or file name."
+msgid "team config file '%s' contains non-valid utf-8"
+msgstr ""
+
+#: ../clients/cli/common.c:888
+#, fuzzy, c-format
+msgid "'%s' does not contain a valid team configuration"
 msgstr "'%s' は有効な team 設定でもファイル名でもありません"
 
-#: ../clients/cli/common.c:958
+#: ../clients/cli/common.c:891
+#, c-format
+msgid "team configuration must be a JSON object"
+msgstr ""
+
+#: ../clients/cli/common.c:944
+#, c-format
+msgid "cannot read pac-script from file '%s'"
+msgstr ""
+
+#: ../clients/cli/common.c:951
+#, fuzzy, c-format
+msgid "file '%s' contains non-valid utf-8"
+msgstr "インデックス '%s' は無効です"
+
+#: ../clients/cli/common.c:964
+#, fuzzy, c-format
+msgid "'%s' does not contain a valid PAC Script"
+msgstr "'%s' は有効な PSK ではありません"
+
+#: ../clients/cli/common.c:967
+#, fuzzy, c-format
+msgid "Not a valid PAC Script"
+msgstr "は有効な MAC アドレスではありません"
+
+#: ../clients/cli/common.c:1090
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "エラー: openconnect が失敗しました: %s\n"
 
-#: ../clients/cli/common.c:965
+#: ../clients/cli/common.c:1097
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "エラー: openconnect がステータス %d で失敗しました\n"
 
-#: ../clients/cli/common.c:967
+#: ../clients/cli/common.c:1099
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
 
-#: ../clients/cli/common.c:1045
+#: ../clients/cli/common.c:1180
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
-"警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--ask' "
-"オプションがないと尋ねることができません。\n"
+"警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
+"ask' オプションがないと尋ねることができません。\n"
+
+#: ../clients/cli/common.c:1609 ../clients/nm-online.c:159
+#, c-format
+msgid "Error: Could not create NMClient object: %s."
+msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
+
+#: ../clients/cli/common.c:1629
+msgid "Error: NetworkManager is not running."
+msgstr "エラー: NetworkManager が起動していません。"
+
+#: ../clients/cli/common.c:1713
+#, c-format
+msgid "Error: argument '%s' not understood. Try passing --help instead."
+msgstr ""
+
+#: ../clients/cli/common.c:1723
+#, fuzzy
+msgid "Error: missing argument. Try passing --help."
+msgstr "エラー: %s オプション用の引数がありません。"
+
+#: ../clients/cli/common.c:1776
+msgid "access denied"
+msgstr ""
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:41
+#: ../clients/cli/connections.c:62
 msgid "Setting name? "
 msgstr "設定名は? "
 
-#: ../clients/cli/connections.c:42
+#: ../clients/cli/connections.c:63
 msgid "Property name? "
 msgstr "プロパティ名は? "
 
-#: ../clients/cli/connections.c:43
+#: ../clients/cli/connections.c:64
 msgid "Enter connection type: "
 msgstr "接続タイプを入力してください: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:46
-msgid "Connection type: "
+#: ../clients/cli/connections.c:67
+#, fuzzy
+msgid "Connection type"
 msgstr "接続タイプ: "
 
-#: ../clients/cli/connections.c:47
-msgid "VPN type: "
+#: ../clients/cli/connections.c:68
+#, fuzzy
+msgid "Interface name [*]"
+msgstr "インターフェース名 [*]: "
+
+#: ../clients/cli/connections.c:69
+#, fuzzy
+msgid "VPN type"
 msgstr "VPN タイプ: "
 
-#: ../clients/cli/connections.c:48
-msgid "Master: "
+#: ../clients/cli/connections.c:70
+#, fuzzy
+msgid "Master"
 msgstr "マスター: "
 
-#: ../clients/cli/connections.c:49
-msgid "Connection (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:72 ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "トランスポートモード"
 
-#: ../clients/cli/connections.c:50
-msgid "VPN connection (name, UUID, or path): "
-msgstr "VPN 接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:77
+#, fuzzy
+msgid "Bluetooth type"
+msgstr "Bluetooth タイプ %s"
 
-#: ../clients/cli/connections.c:51
-msgid "Connection(s) (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:83
+#, fuzzy
+msgid "Bonding mode"
+msgstr "ボンディングモニタリングモード %s"
 
-#: ../clients/cli/connections.c:52
-msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4257
+#, fuzzy
+msgid "Bonding monitoring mode"
+msgstr "ボンディングモニタリングモード %s"
+
+#: ../clients/cli/connections.c:90
+#, fuzzy
+msgid "Protocol"
+msgstr "プロトコル %s"
+
+#: ../clients/cli/connections.c:93
+msgid "Wi-Fi mode"
+msgstr "Wi-Fi モード"
+
+#: ../clients/cli/connections.c:99
+msgid "ADSL encapsulation"
+msgstr "ADSL カプセル化"
+
+#: ../clients/cli/connections.c:102
+#, fuzzy
+msgid "Tun mode"
+msgstr "トンネルモード: "
 
-#: ../clients/cli/connections.c:53
-msgid "Tunnel mode: "
+#: ../clients/cli/connections.c:107
+#, fuzzy
+msgid "IP Tunnel mode"
 msgstr "トンネルモード: "
 
-#: ../clients/cli/connections.c:54
-msgid "MACVLAN mode: "
+#: ../clients/cli/connections.c:109
+#, fuzzy
+msgid "MACVLAN mode"
 msgstr "MACVLAN モード: "
 
+#: ../clients/cli/connections.c:111
+#, fuzzy
+msgid "Connection (name, UUID, or path)"
+msgstr "接続 (名前、UUID またはパス): "
+
+#: ../clients/cli/connections.c:112
+#, fuzzy
+msgid "VPN connection (name, UUID, or path)"
+msgstr "VPN 接続 (名前、UUID またはパス): "
+
+#: ../clients/cli/connections.c:113
+#, fuzzy
+msgid "Connection(s) (name, UUID, or path)"
+msgstr "接続 (名前、UUID またはパス): "
+
+#: ../clients/cli/connections.c:114
+#, fuzzy
+msgid "Connection(s) (name, UUID, path or apath)"
+msgstr "接続 (名前、UUID またはパス): "
+
 #. 0
-#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
-#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
-#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
-#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
-#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
-#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
+#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:212
+#: ../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
 msgid "NAME"
 msgstr "名前"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
+#: ../clients/cli/connections.c:121 ../clients/cli/connections.c:213
 msgid "UUID"
 msgstr "UUID"
 
@@ -665,35 +774,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
-#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
-#: ../clients/cli/devices.c:179
+#: ../clients/cli/connections.c:122 ../clients/cli/connections.c:234
+#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58
+#: ../clients/cli/devices.c:180
 msgid "TYPE"
 msgstr "タイプ"
 
 #. 2
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:123
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
 #. 3
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:124
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:125 ../clients/cli/devices.c:73
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
 #. 5
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:126
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOCONNECT-PRIORITY"
 
 #. 6
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:127
 msgid "READONLY"
 msgstr "読み込み専用"
 
@@ -702,17 +811,17 @@ msgstr "読み込み専用"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
-#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
-#: ../clients/cli/devices.c:182
+#: ../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
 msgid "DBUS-PATH"
 msgstr "DBUS パス"
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
-#: ../clients/cli/devices.c:181
+#: ../clients/cli/connections.c:129 ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:182
 msgid "ACTIVE"
 msgstr "アクティブ"
 
@@ -721,9 +830,9 @@ msgstr "アクティブ"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
-#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
+#: ../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
 msgid "DEVICE"
 msgstr "デバイス"
 
@@ -732,119 +841,124 @@ msgstr "デバイス"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
-#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:36
+#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:215
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67
+#: ../clients/cli/general.c:39
 msgid "STATE"
 msgstr "状態"
 
 #. 11
-#: ../clients/cli/connections.c:85
+#: ../clients/cli/connections.c:132
 msgid "ACTIVE-PATH"
 msgstr "ACTIVE-PATH"
 
+#. 12
+#: ../clients/cli/connections.c:133
+#, fuzzy
+msgid "SLAVE"
+msgstr "スレーブ"
+
 #. 2
-#: ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:214
 msgid "DEVICES"
 msgstr "デバイス"
 
 #. 4
-#: ../clients/cli/connections.c:197
+#: ../clients/cli/connections.c:216
 msgid "DEFAULT"
 msgstr "デフォルト"
 
 #. 5
-#: ../clients/cli/connections.c:198
+#: ../clients/cli/connections.c:217
 msgid "DEFAULT6"
 msgstr "デフォルト6"
 
 #. 6
-#: ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:218
 msgid "SPEC-OBJECT"
 msgstr "スペックオブジェクト"
 
 #. 7
 #. 4
-#. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
-#: ../clients/tui/nmt-connect-connection-list.c:405
+#: ../clients/cli/connections.c:219 ../clients/cli/connections.c:257
+#: ../clients/cli/general.c:1131 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
-#: ../clients/cli/devices.c:78
+#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:47
+#: ../clients/cli/devices.c:79
 msgid "CON-PATH"
 msgstr "CON パス"
 
 #. 10
-#: ../clients/cli/connections.c:203
+#: ../clients/cli/connections.c:222
 msgid "ZONE"
 msgstr "ゾーン"
 
 #. 11
-#: ../clients/cli/connections.c:204
+#: ../clients/cli/connections.c:223
 msgid "MASTER-PATH"
 msgstr "マスターパス"
 
 #. 1
-#: ../clients/cli/connections.c:216
+#: ../clients/cli/connections.c:235
 msgid "USERNAME"
 msgstr "ユーザー名"
 
 #. 3
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:237
 msgid "BANNER"
 msgstr "バナー"
 
 #. 4
-#: ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:238
 msgid "VPN-STATE"
 msgstr "VPN の状態"
 
 #. 5
-#: ../clients/cli/connections.c:220
+#: ../clients/cli/connections.c:239
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
+#: ../clients/cli/connections.c:252 ../clients/cli/devices.c:236
 msgid "GENERAL"
 msgstr "全般"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
+#: ../clients/cli/connections.c:253 ../clients/cli/devices.c:243
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
+#: ../clients/cli/connections.c:254 ../clients/cli/devices.c:244
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
+#: ../clients/cli/connections.c:255 ../clients/cli/devices.c:245
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:256 ../clients/cli/devices.c:246
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:272
-#, c-format
+#: ../clients/cli/connections.c:288
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | monitor | "
-"reload | load }\n"
+"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
+"monitor | reload | load | import | export }\n"
 "\n"
 "  show [--active] [--order <order spec>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
@@ -854,8 +968,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -891,8 +1005,8 @@ msgstr ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -915,7 +1029,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:310
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -945,19 +1059,26 @@ msgstr ""
 "\n"
 "ARGUMENTS := [--active] [--order <order spec>]\n"
 "\n"
-"メモリー内およびディスク上接続プロファイルを一覧表示します。一部の接続プロファイルは、デバイスが\n"
-"その接続プロファイルを使用している場合でもアクティブなことがあります。パラメーターがないと、\n"
-"すべてのプロファイルが一覧表示されます。--active オプションが指定された場合は、アクティブな\n"
-"プロファイルのみが表示されます。--order が指定された場合は、カスタムの接続順序が可能になります (man ページを参照)。\n"
+"メモリー内およびディスク上接続プロファイルを一覧表示します。一部の接続プロ"
+"ファイルは、デバイスが\n"
+"その接続プロファイルを使用している場合でもアクティブなことがあります。パラ"
+"メーターがないと、\n"
+"すべてのプロファイルが一覧表示されます。--active オプションが指定された場合"
+"は、アクティブな\n"
+"プロファイルのみが表示されます。--order が指定された場合は、カスタムの接続順"
+"序が可能になります (man ページを参照)。\n"
 "\n"
 "ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "指定された接続の詳細を表示します。デフォルトでは、静的な接続とアクティブな\n"
-"接続データが表示されます。グローバルな '--fields' オプションを使用すると、出力をフィルタリング\n"
-"できます。--active オプションが指定された場合は、アクティブなプロファイルのみが考慮されます。\n"
-"関連するシークレットも表示する場合は、グローバルな --show-secrets オプションを使用します。\n"
+"接続データが表示されます。グローバルな '--fields' オプションを使用すると、出"
+"力をフィルタリング\n"
+"できます。--active オプションが指定された場合は、アクティブなプロファイルのみ"
+"が考慮されます。\n"
+"関連するシークレットも表示する場合は、グローバルな --show-secrets オプション"
+"を使用します。\n"
 
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:331
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1001,7 +1122,7 @@ msgstr ""
 "passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:352
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1023,13 +1144,13 @@ msgstr ""
 "で識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:364
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -1116,8 +1237,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1167,8 +1288,8 @@ msgid ""
 msgstr ""
 "使い方: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <タイプ>\n"
@@ -1255,8 +1376,8 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <ユーザー名>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1285,7 +1406,8 @@ msgstr ""
 "                  [tap yes|no]\n"
 "\n"
 "    vxlan:        id <VXLAN ID>\n"
-"                  remote <マルチキャストグループの IP またはリモートアドレス>\n"
+"                  remote <マルチキャストグループの IP またはリモートアドレス"
+">\n"
 "                  [local <ソース IP>]\n"
 "                  [dev <親デバイス (ifname または接続 UUID)>]\n"
 "                  [source-port-min <0-65535>]\n"
@@ -1304,7 +1426,7 @@ msgstr ""
 "                  [ip6 <IPv6 アドレス>] [gw6 <IPv6 ゲートウェイ>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:476
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1319,8 +1441,8 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1333,15 +1455,16 @@ msgstr ""
 "ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "接続プロファイルの 1 つ以上のプロパティーを変更します。\n"
-"プロファイルは名前、UUID、または D-Bus パスで識別されます。複数の値から成るプロパティーの場合は、\n"
+"プロファイルは名前、UUID、または D-Bus パスで識別されます。複数の値から成るプ"
+"ロパティーの場合は、\n"
 "プロパティー名にオプションの '+' または '-' プレフィックスを使用できます。\n"
 "'+' 記号を使用すると、値全体を上書きせずにアイテムを追加できます。\n"
 "'-' 記号を使用すると、値全体の代わりに、選択されたアイテムを削除できます。\n"
 "\n"
 "例:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1349,7 +1472,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:499
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1357,7 +1480,8 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) "
+"and\n"
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
@@ -1366,11 +1490,12 @@ msgstr ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <新しい名前>\n"
 "\n"
 "既存の接続プロファイルをクローンします。新しく作成された接続は\n"
-"uuid プロパティー (生成されます) と id (<新しい名前> 引数として提供されます)\n"
+"uuid プロパティー (生成されます) と id (<新しい名前> 引数として提供されま"
+"す)\n"
 "を除き <ID> の完全なコピーになります。\n"
 "\n"
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:511
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1397,7 +1522,7 @@ msgstr ""
 "インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:526
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1416,7 +1541,7 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:537
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1437,18 +1562,19 @@ msgstr ""
 "何も指定されない場合は、すべての接続プロファイルを監視します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:549
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
 "\n"
 "Reload all connection files from disk.\n"
 "\n"
-msgstr "使い方: nmcli connection reload { help }\n"
+msgstr ""
+"使い方: nmcli connection reload { help }\n"
 "\n"
 "ディスクからすべての接続ファイルを再読み込みします。\n"
 
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:557
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1470,7 +1596,7 @@ msgstr ""
 "状態を認識させるため必ずこのコマンドを使用してください。\n"
 "\n"
 
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:569
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1494,7 +1620,7 @@ msgstr ""
 "NetworkManager VPN プラグインによりインポートされます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:582
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1513,1282 +1639,920 @@ msgstr ""
 "データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:624
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:626
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:630
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:642
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続(準備)"
 
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:644
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続(認証が必要)"
 
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:646
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:648
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続(IP 設定を取得)"
 
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:650
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:652
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:654
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:724
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:744
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:756 ../clients/cli/connections.c:1183
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:943 ../clients/cli/settings.c:2061
 msgid "never"
 msgstr "しない"
 
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1171
+#, fuzzy
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1407
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "無効なフィールド '%s'; 許可されたフィールド: %s および %s、または %s、%s"
+msgstr ""
+"無効なフィールド '%s'; 許可されたフィールド: %s および %s、または %s、%s"
 
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1422 ../clients/cli/connections.c:1430
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' は孤立する必要があります"
 
+#: ../clients/cli/connections.c:1630
+#, c-format
+msgid "incorrect string '%s' of '--order' option"
+msgstr "'--order' オプションの正しくない文字列 '%s'"
+
+#: ../clients/cli/connections.c:1656
+#, c-format
+msgid "incorrect item '%s' in '--order' option"
+msgstr "'--order' オプションの正しくないアイテム '%s'"
+
+#: ../clients/cli/connections.c:1686
+#, fuzzy
+msgid "No connection specified"
+msgstr "エラー: 接続が指定されていません。"
+
+#: ../clients/cli/connections.c:1699
+#, fuzzy, c-format
+msgid "%s argument is missing"
+msgstr "エラー: %s 引数がありません。"
+
+#: ../clients/cli/connections.c:1709
+#, fuzzy, c-format
+msgid "unknown connection '%s'"
+msgstr "エラー: 不明な接続 '%s'\n"
+
+#: ../clients/cli/connections.c:1750
+msgid "'--order' argument is missing"
+msgstr "'--order' 引数がありません"
+
 #. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1792
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager のアクティブなプロファイル"
 
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1793
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#: ../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
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1863
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - そのような接続プロファイルはありません。"
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../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
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:2025
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:2033
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:2053
+#, fuzzy, c-format
+msgid "device '%s' not compatible with connection '%s':"
+msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
+
+#: ../clients/cli/connections.c:2089
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:2092
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:2112
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:2114 ../clients/cli/general.c:280
 msgid "none"
 msgstr "なし"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:2116
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:2118
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:2120
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:2122
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:2124
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:2126
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:2128
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:2130
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:2132
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:2134
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2372 ../clients/cli/connections.c:6382
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:2164
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "接続が正常にアクティベートされました (マスターはスレーブを待機しています) (D-Bus アクティブパス: %s)\n"
+msgstr ""
+"接続が正常にアクティベートされました (マスターはスレーブを待機しています) (D-"
+"Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:2176 ../clients/cli/connections.c:2197
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "エラー: 接続のアクティベートに失敗しました。"
 
-#: ../clients/cli/connections.c:2053
+#: ../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:2061
+#: ../clients/cli/connections.c:2252
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
-#, c-format
-msgid "Error: Timeout %d sec expired."
+#: ../clients/cli/connections.c:2266
+#, fuzzy, c-format
+msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2352
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2441
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2453
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にコロンがありません"
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2461
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にドットがありません"
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2474
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' の設定名が無効です"
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2530
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2535
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../clients/cli/connections.c:2402
-#, c-format
-msgid "Error: Connection '%s' does not exist."
-msgstr "エラー: 接続 '%s' が存在しません。"
-
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../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
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2681
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2700
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2716
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
+msgstr ""
+"接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2790 ../clients/cli/connections.c:8260
+#: ../clients/cli/connections.c:8292 ../clients/cli/connections.c:8445
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2829
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2830
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブな一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2839
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:3300 ../clients/cli/utils.c:646
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
-#: ../clients/cli/connections.c:3032
-#, c-format
-msgid "Error: '%s': '%s' is not a valid %s MAC address."
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
-#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
-msgid "Ethernet"
-msgstr "Ethernet"
-
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3460
 #, c-format
-msgid "Error: 'mtu': '%s' is not a valid MTU."
-msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3634
 #, c-format
-msgid "Error: 'parent': '%s' is not a valid interface name."
-msgstr "エラー: 'parent': '%s' は有効なインターフェース名ではありません。"
+msgid "Error: don't know how to create '%s' setting."
+msgstr "エラー: '%s' 設定を作成する方法がわかりません。"
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3645
 #, c-format
-msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
-msgstr "エラー: 'p-key': '%s' は有効な InfiniBand P_KEY ではありません。"
+msgid "Error: invalid property '%s': %s."
+msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3662
 #, c-format
-msgid "Error: '%s' is not a valid UID/GID."
-msgstr "エラー: '%s' は有効な UID/GID ではありません。"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3681
 #, c-format
-msgid "Error: '%s': '%s' is not a valid %s %s."
-msgstr "エラー: '%s': '%s' は有効な %s %s ではありません。"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
 
-#: ../clients/cli/connections.c:3162
-msgid "Wi-Fi mode"
-msgstr "Wi-Fi モード"
+#: ../clients/cli/connections.c:3707
+#, fuzzy, c-format
+msgid "Error: '%s' is mandatory."
+msgstr "エラー: '%s' を繰り返すことはできません。"
 
-#: ../clients/cli/connections.c:3171
-msgid "InfiniBand transport mode"
-msgstr "InfiniBand トランスポートモード"
+#: ../clients/cli/connections.c:3739
+#, fuzzy, c-format
+msgid "Error: invalid slave type; %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3183
-msgid "ADSL protocol"
-msgstr "ADSL プロトコル"
+#: ../clients/cli/connections.c:3752
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3194
-msgid "ADSL encapsulation"
-msgstr "ADSL カプセル化"
+#: ../clients/cli/connections.c:3939
+#, fuzzy, c-format
+msgid "Error: bad connection type: %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3203
-msgid "TUN device mode"
-msgstr "TUN デバイスモード"
+#: ../clients/cli/connections.c:4002
+#, fuzzy, c-format
+msgid "Error: '%s': %s"
+msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/connections.c:3216
-#, c-format
-msgid "Error: 'flags': '%s' is not valid; use <0-7>."
-msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
+#: ../clients/cli/connections.c:4023
+#, fuzzy
+msgid "Error: master is required"
+msgstr "エラー: 'マスター' が必要です。"
 
-#: ../clients/cli/connections.c:3238
-#, c-format
-msgid "Error: '%s': '%s' is not valid; %s "
-msgstr "エラー: '%s': '%s' は無効です; %s "
+#: ../clients/cli/connections.c:4082
+#, fuzzy, c-format
+msgid "Error: error adding bond option '%s=%s'."
+msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:4113
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+"エラー: '%s' は無効なモニタリングモードです; '%s' または '%s' を使用してくだ"
+"さい。\n"
 
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:4144
 #, c-format
-msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
-msgstr "エラー: '%s': '%s' は無効です; <%u-%u> を使用してください。"
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr ""
+"エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
-#, c-format
-msgid "There is %d optional argument for '%s' connection type.\n"
-msgid_plural "There are %d optional arguments for '%s' connection type.\n"
-msgstr[0] "'%2$s' 接続タイプには %1$d 種類のオプション引数があります。\n"
+#: ../clients/cli/connections.c:4219
+#, fuzzy
+msgid "PPPoE username"
+msgstr "PPPoE ユーザー名: "
 
-#: ../clients/cli/connections.c:3500
-#, 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:4220 ../clients/cli/connections.c:4241
+#: ../clients/cli/connections.c:4243 ../clients/cli/connections.c:4292
+#, fuzzy
+msgid "Password [none]"
+msgstr "パスワード [none]: "
 
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
-msgid "ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:4221
+#, fuzzy
+msgid "Service [none]"
+msgstr "サービス [none]: "
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
-msgid "MTU [auto]: "
+#: ../clients/cli/connections.c:4222 ../clients/cli/connections.c:4225
+#: ../clients/cli/connections.c:4234
+#, fuzzy
+msgid "MTU [auto]"
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
-msgid "MAC [none]: "
+#: ../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
+#, fuzzy
+msgid "MAC [none]"
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3544
-msgid "Cloned MAC [none]: "
+#: ../clients/cli/connections.c:4224 ../clients/cli/connections.c:4236
+#, fuzzy
+msgid "Cloned MAC [none]"
 msgstr "クローンの MAC [none]: "
 
-#: ../clients/cli/connections.c:3592
-#, c-format
-msgid "Transport mode %s"
-msgstr "トランスポートモード %s"
-
-#: ../clients/cli/connections.c:3605
-msgid "Parent interface [none]: "
+#: ../clients/cli/connections.c:4229
+#, fuzzy
+msgid "Parent interface [none]"
 msgstr "親インターフェース [none]: "
 
-#: ../clients/cli/connections.c:3616
-msgid "P_KEY [none]: "
+#: ../clients/cli/connections.c:4230
+#, fuzzy
+msgid "P_KEY [none]"
 msgstr "P_KEY [none]: "
 
-#: ../clients/cli/connections.c:3626
-#, c-format
-msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
-msgstr "エラー: 'parent' を指定する場合、'p-key' は必須です。\n"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
-#, c-format
-msgid "Mode %s"
-msgstr "モード %s"
-
-#. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
-#: ../libnm/nm-device.c:1808
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
-msgid "PPPoE"
-msgstr "PPPoE"
-
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
-msgid "Password [none]: "
-msgstr "パスワード [none]: "
+#. 0
+#: ../clients/cli/connections.c:4231 ../clients/cli/connections.c:4286
+#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
 
-#: ../clients/cli/connections.c:3700
-msgid "Service [none]: "
-msgstr "サービス [none]: "
+#: ../clients/cli/connections.c:4237
+#, fuzzy
+msgid "WiMAX NSP name"
+msgstr "WiMAX NSP 名: "
 
-#. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
-msgid "mobile broadband"
-msgstr "モバイルブロードバンド"
+#: ../clients/cli/connections.c:4239
+#, fuzzy
+msgid "APN"
+msgstr "AP"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
-msgid "Username [none]: "
+#: ../clients/cli/connections.c:4240 ../clients/cli/connections.c:4242
+#: ../clients/cli/connections.c:4285
+#, fuzzy
+msgid "Username [none]"
 msgstr "ユーザー名 [none]: "
 
-#. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
-msgid "bluetooth"
-msgstr "bluetooth"
-
-#: ../clients/cli/connections.c:3756
-#, c-format
-msgid "Bluetooth type %s"
-msgstr "Bluetooth タイプ %s"
+#: ../clients/cli/connections.c:4244
+#, fuzzy
+msgid "Bluetooth device address"
+msgstr "Bluetooth デバイスアドレス: "
 
-#: ../clients/cli/connections.c:3762
-#, c-format
-msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "エラー: ''bt-type': '%s' は有効な bluetooth タイプではありません。\n"
+#: ../clients/cli/connections.c:4247
+#, fuzzy
+msgid "VLAN parent device or connection UUID"
+msgstr "VLAN 親デバイスまたは接続 UUID: "
 
-#. Ask for optional 'vlan' arguments.
-#. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
-#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
-msgid "VLAN"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:4249
+#, fuzzy
+msgid "VLAN ID (<0-4094>)"
+msgstr "VLAN ID <0-4094>: "
 
-#: ../clients/cli/connections.c:3794
-msgid "VLAN flags (<0-7>) [none]: "
+#: ../clients/cli/connections.c:4250
+#, fuzzy
+msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:3805
-msgid "Ingress priority maps [none]: "
+#: ../clients/cli/connections.c:4251
+#, fuzzy
+msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:3816
-msgid "Egress priority maps [none]: "
+#: ../clients/cli/connections.c:4252
+#, fuzzy
+msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:3827
-msgid "Bonding mode [balance-rr]: "
-msgstr "ボンドモード [balance-rr]: "
-
-#. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
-msgid "bond"
-msgstr "ボンド"
-
-#: ../clients/cli/connections.c:3865
-msgid "Bonding primary interface [none]: "
+#: ../clients/cli/connections.c:4255
+#, fuzzy
+msgid "Bonding primary interface [none]"
 msgstr "ボンドのプライマリインターフェース [none]:"
 
-#: ../clients/cli/connections.c:3868
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name.\n"
-msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。\n"
-
-#: ../clients/cli/connections.c:3876
-#, c-format
-msgid "Bonding monitoring mode %s"
-msgstr "ボンディングモニタリングモード %s"
-
-#: ../clients/cli/connections.c:3882
-#, 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:3891
-msgid "Bonding miimon [100]: "
+#: ../clients/cli/connections.c:4259
+#, fuzzy
+msgid "Bonding miimon [100]"
 msgstr "ボンドの miimon [100]:"
 
-#: ../clients/cli/connections.c:3894
-#, c-format
-msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'miimon': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3902
-msgid "Bonding downdelay [0]: "
+#: ../clients/cli/connections.c:4260
+#, fuzzy
+msgid "Bonding downdelay [0]"
 msgstr "ボンドの downdelay [0]: "
 
-#: ../clients/cli/connections.c:3905
-#, c-format
-msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'downdelay': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3913
-msgid "Bonding updelay [0]: "
+#: ../clients/cli/connections.c:4261
+#, fuzzy
+msgid "Bonding updelay [0]"
 msgstr "ボンドの updelay [0]: "
 
-#: ../clients/cli/connections.c:3916
-#, c-format
-msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'updelay': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3925
-msgid "Bonding arp-interval [0]: "
+#: ../clients/cli/connections.c:4262
+#, fuzzy
+msgid "Bonding arp-interval [0]"
 msgstr "ボンドの arp-interval [0]: "
 
-#: ../clients/cli/connections.c:3928
-#, c-format
-msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'arp-interval': '%s' は無効な数値です <0-%u>。\n"
-
-#. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
-msgid "Bonding arp-ip-target [none]: "
+#: ../clients/cli/connections.c:4264
+#, fuzzy
+msgid "Bonding arp-ip-target [none]"
 msgstr "ボンドの arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:3943
-msgid "LACP rate ('slow' or 'fast') [slow]: "
+#: ../clients/cli/connections.c:4266
+#, fuzzy
+msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('低速' または '高速') [低速]: "
 
-#: ../clients/cli/connections.c:3949
-#, c-format
-msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
-msgstr "エラー: 'lacp_rate': '%s' が無効です ('低速' または '高速')。\n"
-
-#: ../clients/cli/connections.c:3972
-msgid "Team JSON configuration [none]: "
+#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4269
+#, fuzzy
+msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]: "
 
-#: ../clients/cli/connections.c:3989
-msgid "team"
-msgstr "team "
-
-#: ../clients/cli/connections.c:3995
-msgid "team-slave"
-msgstr "team-slave"
-
-#. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
-msgid "bridge"
-msgstr "ブリッジ"
-
-#: ../clients/cli/connections.c:4013
-#, c-format
-msgid "Enable STP %s"
+#: ../clients/cli/connections.c:4270
+#, fuzzy
+msgid "Enable STP [no]"
 msgstr "STP %s の有効化 "
 
-#: ../clients/cli/connections.c:4018
-#, c-format
-msgid "Error: 'stp': %s.\n"
-msgstr "エラー: 'stp': %s。\n"
-
-#: ../clients/cli/connections.c:4026
-msgid "STP priority [32768]: "
+#: ../clients/cli/connections.c:4272
+#, fuzzy
+msgid "STP priority [32768]"
 msgstr "STP の優先度 [32768]: "
 
-#: ../clients/cli/connections.c:4030
-#, c-format
-msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
-msgstr "エラー: 'priority': '%s' は無効な数値です <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4038
-msgid "Forward delay [15]: "
+#: ../clients/cli/connections.c:4273
+#, fuzzy
+msgid "Forward delay [15]"
 msgstr "フォワード遅延 [15]:"
 
-#: ../clients/cli/connections.c:4042
-#, c-format
-msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
-msgstr "エラー: 'forward-delay': '%s' は無効な数値です <2-30>。\n"
-
-#: ../clients/cli/connections.c:4051
-msgid "Hello time [2]: "
+#: ../clients/cli/connections.c:4274
+#, fuzzy
+msgid "Hello time [2]"
 msgstr "Hello タイム [2]: "
 
-#: ../clients/cli/connections.c:4055
-#, c-format
-msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
-msgstr "エラー: 'hello-time': '%s' は無効な数値です <1-10>。\n"
-
-#: ../clients/cli/connections.c:4063
-msgid "Max age [20]: "
+#: ../clients/cli/connections.c:4275
+#, fuzzy
+msgid "Max age [20]"
 msgstr "最大エイジ [20]: "
 
-#: ../clients/cli/connections.c:4067
-#, c-format
-msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
-msgstr "エラー: 'max-age': '%s' は無効な数値です <6-40>。\n"
-
-#: ../clients/cli/connections.c:4075
-msgid "MAC address ageing time [300]: "
+#: ../clients/cli/connections.c:4276
+#, fuzzy
+msgid "MAC address ageing time [300]"
 msgstr "MAC アドレスのエージングタイム [300]:"
 
-#: ../clients/cli/connections.c:4079
-#, c-format
-msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
-msgstr "エラー: 'ageing-time': '%s' は無効な数値です <0-1000000>。\n"
-
-#: ../clients/cli/connections.c:4088
-#, c-format
-msgid "Enable IGMP snooping %s"
-msgstr "IGMP スヌーピング %s の有効化"
-
-#: ../clients/cli/connections.c:4093
-#, c-format
-msgid "Error: 'multicast-snooping': %s.\n"
-msgstr "エラー: 'multicast-snooping': %s。\n"
-
-#. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
-msgid "bridge-slave"
-msgstr "bridge-slave"
+#: ../clients/cli/connections.c:4277
+#, fuzzy
+msgid "Enable IGMP snooping [no]"
+msgstr "IGMP スヌーピングの有効化"
 
-#: ../clients/cli/connections.c:4125
-msgid "Bridge port priority [32]: "
+#: ../clients/cli/connections.c:4280
+#, fuzzy
+msgid "Bridge port priority [32]"
 msgstr "ブリッジポートの優先度 [32]:"
 
-#: ../clients/cli/connections.c:4138
-msgid "Bridge port STP path cost [100]: "
+#: ../clients/cli/connections.c:4281
+#, fuzzy
+msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジポートの STP パスコスト [100]: "
 
-#: ../clients/cli/connections.c:4152
-#, c-format
-msgid "Hairpin %s"
-msgstr "ヘアピン %s"
-
-#: ../clients/cli/connections.c:4157
-#, c-format
-msgid "Error: 'hairpin': %s.\n"
-msgstr "エラー: 'hairpin': %s。\n"
-
-#. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
-#: ../libnm/nm-device.c:1806
-msgid "OLPC Mesh"
-msgstr "OLPC メッシュ"
+#: ../clients/cli/connections.c:4282
+#, fuzzy
+msgid "Hairpin [no]"
+msgstr "ヘアピンモード"
 
-#: ../clients/cli/connections.c:4189
-msgid "OLPC Mesh channel [1]: "
+#: ../clients/cli/connections.c:4287
+#, fuzzy
+msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュチャンネル [1]: "
 
-#: ../clients/cli/connections.c:4192
-#, c-format
-msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
-msgstr "エラー: 'channel': '%s' は無効な数値です <1-13>。\n"
-
-#: ../clients/cli/connections.c:4200
-msgid "DHCP anycast MAC address [none]: "
+#: ../clients/cli/connections.c:4288
+#, fuzzy
+msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]: "
 
-#. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
-#: ../libnm/nm-device.c:1822
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../clients/cli/connections.c:4227
-#, c-format
-msgid "ADSL encapsulation %s"
-msgstr "ADSL カプセル化 %s"
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * 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/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 "ユーザー名"
 
-#. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
-msgid "macvlan"
-msgstr "macvlan"
+#: ../clients/cli/connections.c:4295
+#, fuzzy
+msgid "MACVLAN parent device or connection UUID"
+msgstr "MACVLAN 親デバイスまたは接続 UUID: "
 
-#: ../clients/cli/connections.c:4251
-#, c-format
-msgid "Tap %s"
-msgstr "タップ %s"
+#: ../clients/cli/connections.c:4299
+msgid "Tap [no]"
+msgstr ""
 
-#: ../clients/cli/connections.c:4256
-#, c-format
-msgid "Error: 'tap': %s.\n"
-msgstr "エラー: 'タップ': %s。\n"
+#: ../clients/cli/connections.c:4301
+#, fuzzy
+msgid "VXLAN ID"
+msgstr "VXLAN ID: "
 
-#. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
-#: ../libnm/nm-device.c:1826
-msgid "VXLAN"
-msgstr "VXLAN"
+#: ../clients/cli/connections.c:4302 ../clients/cli/connections.c:4321
+#, fuzzy
+msgid "Remote"
+msgstr "リモート: "
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
-msgid "Parent device [none]: "
+#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4322
+#, fuzzy
+msgid "Parent device [none]"
 msgstr "親デバイス [none]: "
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
-#, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr "エラー: 'dev': '%s' は UUID またはインターフェース名のいずれでもありません。\n"
-
-#: ../clients/cli/connections.c:4291
-msgid "Local address [none]: "
+#: ../clients/cli/connections.c:4305
+#, fuzzy
+msgid "Local address [none]"
 msgstr "ローカルアドレス [none]: "
 
-#: ../clients/cli/connections.c:4296
-#, c-format
-msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "エラー: 'local': '%s' は有効な IP アドレスではありません。\n"
-
-#: ../clients/cli/connections.c:4305
-msgid "Minimum source port [0]: "
+#: ../clients/cli/connections.c:4306
+#, fuzzy
+msgid "Minimum source port [0]"
 msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4309
-#, c-format
-msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'source-port-min': '%s' は有効な数値ではありません <0-65535>。\n"
-
-#: ../clients/cli/connections.c:4318
-msgid "Maximum source port [0]: "
+#: ../clients/cli/connections.c:4307
+#, fuzzy
+msgid "Maximum source port [0]"
 msgstr "最小ソースポート [0]: "
 
-#: ../clients/cli/connections.c:4322
-#, c-format
-msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'source-port-max': '%s' は有効な数値ではありません <0-65535>。\n"
-
-#: ../clients/cli/connections.c:4331
-msgid "Destination port [8472]: "
+#: ../clients/cli/connections.c:4308
+#, fuzzy
+msgid "Destination port [8472]"
 msgstr "送信先ポート [8472]: "
 
-#: ../clients/cli/connections.c:4335
-#, c-format
-msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'destination-port': '%s' は有効な数値ではありません <0-65535>。\n"
-
-#: ../clients/cli/connections.c:4374
-msgid "IPv4 address (IP[/plen]) [none]: "
-msgstr "IPv4 アドレス (IP[/plen]) [none]: "
-
-#: ../clients/cli/connections.c:4376
-msgid "IPv6 address (IP[/plen]) [none]: "
-msgstr "IPv6 アドレス (IP[/plen]) [none]: "
-
-#: ../clients/cli/connections.c:4390
-#, c-format
-msgid "  Address successfully added: %s\n"
-msgstr " アドレスが正常に追加されました: %s\n"
-
-#: ../clients/cli/connections.c:4392
-#, c-format
-msgid "  Warning: address already present: %s\n"
-msgstr " 警告: アドレスがすでにあります: %s\n"
-
-#: ../clients/cli/connections.c:4394
-#, c-format
-msgid "  Warning: ignoring garbage at the end: '%s'\n"
-msgstr "  警告: 末尾の不要なデータを無視しています: '%s'\n"
-
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
-msgid "Error: "
-msgstr "エラー: "
-
-#: ../clients/cli/connections.c:4416
-msgid "IPv4 gateway [none]: "
-msgstr "IPv4 ゲートウェイ [none]: "
-
-#: ../clients/cli/connections.c:4419
-msgid "IPv6 gateway [none]: "
-msgstr "IPv6 ゲートウェイ [none]: "
-
-#: ../clients/cli/connections.c:4439
-#, c-format
-msgid "Error: invalid gateway address '%s'\n"
-msgstr "エラー: 無効なゲートウェイアドレス '%s'\n"
-
-#. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
-#, c-format
-msgid "Do you want to add IP addresses? %s"
-msgstr "IP アドレスを追加しますか? %s"
-
-#: ../clients/cli/connections.c:4460
-#, c-format
-msgid "Press <Enter> to finish adding addresses.\n"
-msgstr "<Enter> を押してアドレスの追加を終了します。\n"
-
-#. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
-#: ../libnm/nm-device.c:1830
-msgid "Tun"
-msgstr "Tun"
-
-#: ../clients/cli/connections.c:4509
-msgid "User ID [none]: "
+#: ../clients/cli/connections.c:4311
+#, fuzzy
+msgid "User ID [none]"
 msgstr "ユーザー ID [none]: "
 
-#: ../clients/cli/connections.c:4522
-msgid "Group ID [none]: "
+#: ../clients/cli/connections.c:4312
+#, fuzzy
+msgid "Group ID [none]"
 msgstr "グループ ID [none]: "
 
-#: ../clients/cli/connections.c:4536
-#, c-format
-msgid "Enable PI %s"
+#: ../clients/cli/connections.c:4313
+#, fuzzy
+msgid "Enable PI [no]"
 msgstr "PI %s の有効化"
 
-#: ../clients/cli/connections.c:4541
-#, c-format
-msgid "Error: 'pi': %s.\n"
-msgstr "エラー: 'pi': %s.\n"
-
-#: ../clients/cli/connections.c:4549
-#, c-format
-msgid "Enable VNET header %s"
+#: ../clients/cli/connections.c:4315
+#, fuzzy
+msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー %s の有効化"
 
-#: ../clients/cli/connections.c:4554
-#, c-format
-msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "エラー: 'vnet-hdr': %s。\n"
-
-#: ../clients/cli/connections.c:4562
-#, c-format
-msgid "Enable multi queue %s"
+#: ../clients/cli/connections.c:4317
+#, fuzzy
+msgid "Enable multi queue [no]"
 msgstr "複数のキュー %s の有効化"
 
-#: ../clients/cli/connections.c:4567
-#, c-format
-msgid "Error: 'multi-queue': %s.\n"
-msgstr "エラー: 'multi-queue': %s。\n"
-
-#. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
-msgid "IP Tunnel"
-msgstr "IP トンネル"
-
-#: ../clients/cli/connections.c:4586
-msgid "Local endpoint [none]: "
+#: ../clients/cli/connections.c:4320
+#, fuzzy
+msgid "Local endpoint [none]"
 msgstr "ローカルエンドポイント [none]: "
 
-#: ../clients/cli/connections.c:4592
-#, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "エラー: 'local': '%s' は有効ではありません。IP アドレスである必要があります\n"
-
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
-#, c-format
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "エラー: <setting>.<property> 引数がありません。"
-
-#: ../clients/cli/connections.c:4663
-#, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "エラー: '%s' の値が不明です。"
-
-#: ../clients/cli/connections.c:4681
-#, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "エラー: 無効な <setting>.<property> '%s' です。"
-
-#: ../clients/cli/connections.c:4689
-#, c-format
-msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
-
-#: ../clients/cli/connections.c:4700
-#, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "エラー: '%s' 設定を作成する方法がわかりません。"
-
-#: ../clients/cli/connections.c:4710
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
-
-#: ../clients/cli/connections.c:4722
-#, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-
-#: ../clients/cli/connections.c:4741
-#, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
-
-#: ../clients/cli/connections.c:4775
-#, c-format
-msgid ""
-"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
-msgstr "警告: 'type' が無視されました。'nmcli connection add \"%s\" ...' を代わりに使用してください。"
-
-#: ../clients/cli/connections.c:4783
-msgid "Error: redundant 'master' option."
-msgstr "エラー: 'master' オプションが冗長です。"
-
-#: ../clients/cli/connections.c:4796
-msgid "Error: 'master' is required."
-msgstr "エラー: 'マスター' が必要です。"
-
-#: ../clients/cli/connections.c:4950
-#, c-format
-msgid "Error: 'parent': not valid without 'p-key'."
-msgstr "エラー: 'parent': 'p-key' がないと使用できません。"
-
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
-msgid "SSID: "
-msgstr "SSID: "
-
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
-msgid "Error: 'ssid' is required."
-msgstr "エラー: 'ssid' が必要です。"
-
-#: ../clients/cli/connections.c:5072
-msgid "WiMAX NSP name: "
-msgstr "WiMAX NSP 名: "
-
-#: ../clients/cli/connections.c:5075
-msgid "Error: 'nsp' is required."
-msgstr "エラー: 'nsp' が必要です。"
-
-#: ../clients/cli/connections.c:5127
-msgid "PPPoE username: "
-msgstr "PPPoE ユーザー名: "
-
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
-msgid "Error: 'username' is required."
-msgstr "エラー: 「ユーザー名」を入力してください。"
-
-#: ../clients/cli/connections.c:5199
-msgid "APN: "
-msgstr "APN: "
-
-#: ../clients/cli/connections.c:5202
-msgid "Error: 'apn' is required."
-msgstr "エラー: 'apn' が必要です。"
-
-#: ../clients/cli/connections.c:5260
-msgid "Bluetooth device address: "
-msgstr "Bluetooth デバイスアドレス: "
-
-#: ../clients/cli/connections.c:5263
-msgid "Error: 'addr' is required."
-msgstr "エラー: 'addr' が必要です。"
-
-#: ../clients/cli/connections.c:5304
-#, 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:5348
-msgid "VLAN parent device or connection UUID: "
-msgstr "VLAN 親デバイスまたは接続 UUID: "
-
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
-msgid "Error: 'dev' is required."
-msgstr "エラー: 'dev' が必要です。"
-
-#: ../clients/cli/connections.c:5355
-msgid "VLAN ID <0-4094>: "
-msgstr "VLAN ID <0-4094>: "
+#: ../clients/cli/connections.c:4324
+#, fuzzy
+msgid "IPv4 address (IP[/plen]) [none]"
+msgstr "IPv4 アドレス (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
-msgid "Error: 'id' is required."
-msgstr "エラー: 'id' が必要です。"
+#: ../clients/cli/connections.c:4326
+#, fuzzy
+msgid "IPv4 gateway [none]"
+msgstr "IPv4 ゲートウェイ [none]: "
 
-#: ../clients/cli/connections.c:5364
-#, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "エラー: 'id': '%s' は無効です; <0-4094> を使用してください。"
+#: ../clients/cli/connections.c:4327
+#, fuzzy
+msgid "IPv6 address (IP[/plen]) [none]"
+msgstr "IPv6 アドレス (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
-#, c-format
-msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
-msgstr "エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
+#: ../clients/cli/connections.c:4329
+#, fuzzy
+msgid "IPv6 gateway [none]"
+msgstr "IPv6 ゲートウェイ [none]: "
 
-#: ../clients/cli/connections.c:5506
-#, c-format
-msgid "Error: 'mode': %s."
-msgstr "エラー: 'モード': %s。"
+#: ../clients/cli/connections.c:4330
+msgid "Proxy method"
+msgstr ""
 
-#: ../clients/cli/connections.c:5515
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name."
-msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。"
+#: ../clients/cli/connections.c:4331
+msgid "Browser Only"
+msgstr ""
 
-#: ../clients/cli/connections.c:5738
-#, c-format
-msgid "Error: 'stp': %s."
-msgstr "エラー:'stp': %s。"
+#: ../clients/cli/connections.c:4332
+msgid "PAC Url"
+msgstr ""
 
-#: ../clients/cli/connections.c:5747
-#, c-format
-msgid "Error: 'multicast-snooping': %s."
-msgstr "エラー: 'multicast-snooping': %s。"
+#: ../clients/cli/connections.c:4333
+msgid "PAC Script"
+msgstr ""
 
-#: ../clients/cli/connections.c:5866
+#: ../clients/cli/connections.c:4468
 #, c-format
-msgid "Error: 'hairpin': %s."
-msgstr "エラー: 'ヘアピン': %s。"
-
-#: ../clients/cli/connections.c:5915
-msgid "Error: 'vpn-type' is required."
-msgstr "エラー: ’vpn タイプ’ が必要です。"
+msgid "Error: value for '%s' is missing."
+msgstr "エラー: '%s' の値が不明です。"
 
-#: ../clients/cli/connections.c:5922
-#, c-format
-msgid "Warning: 'vpn-type': %s not known.\n"
-msgstr "警告: 'vpn-type': %s が不明です。\n"
+#: ../clients/cli/connections.c:4513
+msgid "Error: <setting>.<property> argument is missing."
+msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:5983
+#: ../clients/cli/connections.c:4536
 #, c-format
-msgid "Error: 'channel': '%s' is not valid; use <1-13>."
-msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
+msgid "Error: invalid or not allowed setting '%s': %s."
+msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:6034
-msgid "Username: "
-msgstr "ユーザー名: "
+#: ../clients/cli/connections.c:4560
+#, fuzzy, c-format
+msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
+msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/connections.c:6043
+#: ../clients/cli/connections.c:4574
 #, c-format
-msgid "Protocol %s"
-msgstr "プロトコル %s"
-
-#: ../clients/cli/connections.c:6046
-msgid "Error: 'protocol' is required."
-msgstr "エラー: 'protocol' が必要です。"
-
-#: ../clients/cli/connections.c:6105
-msgid "MACVLAN parent device or connection UUID: "
-msgstr "MACVLAN 親デバイスまたは接続 UUID: "
-
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
-msgid "Error: 'mode' is required."
-msgstr "エラー: 'mode' が必要です。"
-
-#: ../clients/cli/connections.c:6131
-msgid "Error: 'mode' is not valid."
-msgstr "エラー: 'mode' が無効です。"
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "エラー: 無効な <setting>.<property> '%s' です。"
 
-#: ../clients/cli/connections.c:6144
+#: ../clients/cli/connections.c:4615 ../clients/cli/connections.c:8093
 #, c-format
-msgid "Error: 'tap': %s."
-msgstr "エラー: 'tap': %s。"
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
 
-#: ../clients/cli/connections.c:6230
+#: ../clients/cli/connections.c:4620
 #, c-format
-msgid "Error: 'pi': %s."
-msgstr "エラー: 'pi': %s。"
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../clients/cli/connections.c:6241
+#: ../clients/cli/connections.c:4738
 #, c-format
-msgid "Error: 'vnet-hdr': %s."
-msgstr "エラー: 'vnet-hdr': %s。"
+msgid ""
+"You can specify this option more than once. Press <Enter> when you're done.\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:6252
-#, c-format
-msgid "Error: 'multi-queue': %s."
-msgstr "エラー: 'multi-queue': %s。"
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:4776
+#, 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:6321
+#: ../clients/cli/connections.c:4779
 #, c-format
-msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "エラー: 'mode': '%s' は無効です。%s のいずれかを使用してください"
-
-#: ../clients/cli/connections.c:6327
-msgid "Remote endpoint: "
-msgstr "リモートエンドポイント: "
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "指定しますか? %s"
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
-msgid "Error: 'remote' is required."
-msgstr "エラー: 'remote' が必要です。"
+#: ../clients/cli/connections.c:4793
+#, fuzzy
+msgid "Wired Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:6337
-#, c-format
-msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "エラー: 'remote': '%s' は無効です。IP アドレスである必要があります"
+#: ../clients/cli/connections.c:4795 ../src/devices/nm-device-infiniband.c:186
+msgid "InfiniBand connection"
+msgstr "InfiniBand 接続"
 
-#: ../clients/cli/connections.c:6351
-#, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "エラー: 'local': '%s' は無効です。IP アドレスである必要があります"
+#: ../clients/cli/connections.c:4797
+#, fuzzy
+msgid "Wi-Fi connection"
+msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
-#, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name."
-msgstr "エラー: 'dev': '%s' は UUID またはインターフェース名のいずれでもありません。"
+#: ../clients/cli/connections.c:4799
+#, fuzzy
+msgid "WiMAX connection"
+msgstr "CDMA 接続"
 
-#: ../clients/cli/connections.c:6421
-msgid "VXLAN ID: "
-msgstr "VXLAN ID: "
+#: ../clients/cli/connections.c:4801
+msgid "PPPoE"
+msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:6429
-msgid "Remote: "
-msgstr "リモート: "
+#: ../clients/cli/connections.c:4803
+#, fuzzy
+msgid "CDMA mobile broadband connection"
+msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:6438
-#, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "エラー: 'id': '%s' は無効です; <0-16777215> を使用してください。"
+#: ../clients/cli/connections.c:4805
+#, fuzzy
+msgid "GSM mobile broadband connection"
+msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:6464
-#, c-format
-msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "エラー: 'remote': '%s' は無効な IP アドレスです"
+#: ../clients/cli/connections.c:4807
+#, fuzzy
+msgid "bluetooth connection"
+msgstr "ボンド接続"
 
-#: ../clients/cli/connections.c:6473
-#, c-format
-msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "エラー: 'local': '%s' は無効な IP アドレスです"
+#: ../clients/cli/connections.c:4809 ../src/devices/nm-device-vlan.c:432
+msgid "VLAN connection"
+msgstr "VLAN 接続"
 
-#: ../clients/cli/connections.c:6482
-#, c-format
-msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "エラー: 'source-port-min': %s は無効です。<0-65535> を使用してください"
+#: ../clients/cli/connections.c:4811
+#, fuzzy
+msgid "Bond device"
+msgstr "Ethernet デバイス"
 
-#: ../clients/cli/connections.c:6491
-#, c-format
-msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "エラー: 'source-port-max': %s は無効です。<0-65535> を使用してください。"
+#: ../clients/cli/connections.c:4813
+#, fuzzy
+msgid "Team device"
+msgstr "TUN デバイスモード"
 
-#: ../clients/cli/connections.c:6500
-#, c-format
-msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr "エラー: 'destination-port': %s は無効です。<0-65535> を使用してください。"
+#: ../clients/cli/connections.c:4815
+#, fuzzy
+msgid "Team port"
+msgstr "team "
 
-#: ../clients/cli/connections.c:6540
-#, c-format
-msgid "Error: '%s' is not a valid connection type."
-msgstr "エラー: '%s' は無効な接続タイプです。"
+#: ../clients/cli/connections.c:4817
+#, fuzzy
+msgid "Bridge device"
+msgstr "Ethernet デバイス"
 
-#: ../clients/cli/connections.c:6581
-#, c-format
-msgid "Error: IPv4 gateway specified without IPv4 addresses"
-msgstr "エラー: IPv4 ゲートウェイが IPv4 アドレスなしで指定されました"
+#: ../clients/cli/connections.c:4819
+#, fuzzy
+msgid "Bridge port"
+msgstr "ブリッジ"
 
-#: ../clients/cli/connections.c:6585
-#, c-format
-msgid "Error: multiple IPv4 gateways specified"
-msgstr "エラー: 複数の IPv4 ゲートウェイが指定されています"
+#: ../clients/cli/connections.c:4821 ../src/nm-manager.c:3824
+#, fuzzy
+msgid "VPN connection"
+msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:6589
-#, c-format
-msgid "Error: Invalid IPv4 gateway '%s'"
-msgstr "エラー: 無効な IPv4 ゲートウェイ '%s'"
+#: ../clients/cli/connections.c:4823
+#, fuzzy
+msgid "OLPC Mesh connection"
+msgstr "CDMA 接続"
 
-#: ../clients/cli/connections.c:6614
-#, c-format
-msgid "Error: IPv6 gateway specified without IPv6 addresses"
-msgstr "エラー: IPv6 ゲートウェイが IPv6 アドレスなしで指定されました"
+#: ../clients/cli/connections.c:4825 ../src/devices/adsl/nm-device-adsl.c:137
+msgid "ADSL connection"
+msgstr "ADSL 接続"
 
-#: ../clients/cli/connections.c:6618
-#, c-format
-msgid "Error: multiple IPv6 gateways specified"
-msgstr "エラー: 複数の IPv6 ゲートウェイが指定されています"
+#: ../clients/cli/connections.c:4827
+#, fuzzy
+msgid "macvlan connection"
+msgstr "ボンド接続"
 
-#: ../clients/cli/connections.c:6622
-#, c-format
-msgid "Error: Invalid IPv6 gateway '%s'"
-msgstr "エラー: 無効な IPv6 ゲートウェイ '%s'"
+#: ../clients/cli/connections.c:4829 ../src/devices/nm-device-vxlan.c:369
+msgid "VXLAN connection"
+msgstr "VXLAN 接続"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
-#, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
+#: ../clients/cli/connections.c:4831
+#, fuzzy
+msgid "Tun device"
+msgstr "TUN デバイスモード"
 
-#: ../clients/cli/connections.c:6675
-#, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+#: ../clients/cli/connections.c:4833
+#, fuzzy
+msgid "IPv4 protocol"
+msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "エラー: 'タイプ' 引数が必要です。"
+#: ../clients/cli/connections.c:4835
+#, fuzzy
+msgid "IPv6 protocol"
+msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:6959
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "エラー: 無効な接続タイプ; %s。"
+#: ../clients/cli/connections.c:4837
+msgid "Proxy"
+msgstr ""
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:4920 ../clients/cli/utils.c:122
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "エラー: '自動接続': %s。"
+msgid "Error: value for '%s' argument is required."
+msgstr "エラー: '%s' 引数の値が必要です。"
 
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:4926
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:6995
-msgid "Interface name [*]: "
-msgstr "インターフェース名 [*]: "
-
-#: ../clients/cli/connections.c:7000
-#, c-format
-msgid "Error: 'ifname' argument is required."
-msgstr "エラー: 「ifname」引数を入力してください。"
-
-#: ../clients/cli/connections.c:7002
-#, c-format
-msgid "Error: mandatory 'ifname' not seen before '%s'."
-msgstr "エラー: 必須の 'ifname' が '%s' の前にありません。"
-
-#: ../clients/cli/connections.c:7011
-#, c-format
-msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
-msgstr "エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+#: ../clients/cli/connections.c:4998
+#, fuzzy, c-format
+msgid "Error: '%s' argument is required."
+msgstr "エラー: 'タイプ' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:5968
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:8117
+#.
+#: ../clients/cli/connections.c:6050
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2808,7 +2572,8 @@ msgid ""
 msgstr ""
 "---[ メインメニュー ]---\n"
 "goto     [<setting> | <prop>]        :: 設定またはプロパティーに移動する\n"
-"remove   <setting>[.<prop>] | <prop> :: 設定を削除する、またはプロパティー値をリセットする\n"
+"remove   <setting>[.<prop>] | <prop> :: 設定を削除する、またはプロパティー値"
+"をリセットする\n"
 "set      [<setting>.<prop> <value>]  :: プロパティー値を設定する\n"
 "describe [<setting>.<prop>]          :: プロパティーの説明を表示する\n"
 "print    [all | <setting>[.<prop>]]  :: 接続を出力する\n"
@@ -2820,7 +2585,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:6077
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2839,18 +2604,20 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:6084
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 msgstr ""
-"remove <setting>[.<prop>]  :: 設定を削除する、またはプロパティ値をリセットする\n"
+"remove <setting>[.<prop>]  :: 設定を削除する、またはプロパティ値をリセットす"
+"る\n"
 "\n"
 "このコマンドを使って接続から全設定を削除します。または、プロパティを\n"
 "指定している場合にはそのプロパティをデフォルト値としてリセットします。\n"
@@ -2858,7 +2625,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:6091
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2873,7 +2640,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:6096
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2883,9 +2650,10 @@ msgid ""
 msgstr ""
 "describe [<setting>.<prop>]  :: プロパティ値を表示する\n"
 "\n"
-"プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-settings(5) の man ページを参照してください。\n"
+"プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-"
+"settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:6101
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2900,13 +2668,14 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:6106
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed automatically\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
@@ -2916,14 +2685,15 @@ msgstr ""
 "verify [all | fix]  :: 設定または接続の有効性を確認する\n"
 "\n"
 "設定または接続が有効かどうかを確認し、あとで保存することができます。\n"
-"エラーの場合には無効な値を表示します。'fix' オプションにより一部のエラーは自動的に\n"
+"エラーの場合には無効な値を表示します。'fix' オプションにより一部のエラーは自"
+"動的に\n"
 "修正されることがあります。\n"
 "\n"
 "例: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:6115
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2949,7 +2719,7 @@ msgstr ""
 "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
 "必要があります。\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:6126
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2967,23 +2737,28 @@ msgstr ""
 "\n"
 "使用できるオプション:\n"
 "<ifname>    - このデバイスで接続をアクティベートする\n"
-"/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合は / を先頭に付ける)\n"
+"/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
+"は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:6133 ../clients/cli/connections.c:6292
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
-msgstr "back  :: 一つ上のメニューレベルに移動\n"
+msgstr ""
+"back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:6136
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+msgstr ""
+"help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:6139
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -3010,27 +2785,29 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:6161 ../clients/cli/connections.c:6298
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
 "\n"
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
-msgstr "quit  :: nmcli の終了\n"
+msgstr ""
+"quit  :: nmcli の終了\n"
 "\n"
-"nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が求められます。\n"
+"nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
+"求められます。\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:6166 ../clients/cli/connections.c:6303
+#: ../clients/cli/connections.c:6723 ../clients/cli/connections.c:7675
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "不明なコマンド: '%s'\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:8299
+#.
+#: ../clients/cli/connections.c:6232
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3056,17 +2833,18 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:6257
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr "set [<value>]  :: 新しい値の設定\n"
+msgstr ""
+"set [<value>]  :: 新しい値の設定\n"
 "\n"
 "このプロパティに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:6261
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3077,20 +2855,22 @@ msgid ""
 msgstr ""
 "add [<value>]  :: プロパティーに新しい値を追加する\n"
 "\n"
-"このコマンドを実行すると、プロパティーのタイプがコンテナーの場合に、指定した <value> "
-"がこのプロパティーに追加されます。単一値のプロパティーの場合は、そのプロパティー値が置換されます ('set' の場合と同じ)。\n"
+"このコマンドを実行すると、プロパティーのタイプがコンテナーの場合に、指定した "
+"<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
+"プロパティー値が置換されます ('set' の場合と同じ)。\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:6267
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr "change  :: 現在の値を変更\n"
+msgstr ""
+"change  :: 現在の値を変更\n"
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:6271
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3112,9 +2892,12 @@ msgstr ""
 "remove [<value>|<index>|<option name>]  :: 値を削除する\n"
 "\n"
 "プロパティー値を削除します。単一値のプロパティーの場合は、\n"
-"プロパティーがデフォルト値に戻ります。コンテナータイププロパティーの場合は、\n"
-"そのプロパティーのすべての値が削除されます。または、単一アイテムまたはオプション\n"
-"のみを削除するために引数を指定することもできます。引数は削除するアイテムの値またはインデックスか、\n"
+"プロパティーがデフォルト値に戻ります。コンテナータイププロパティーの場合"
+"は、\n"
+"そのプロパティーのすべての値が削除されます。または、単一アイテムまたはオプ"
+"ション\n"
+"のみを削除するために引数を指定することもできます。引数は削除するアイテムの値"
+"またはインデックスか、\n"
 "オプション名 (オプションが指定されたプロパティーの場合) のいずれかです。\n"
 "\n"
 "例: nmcli ipv4.dns> remove 8.8.8.8\n"
@@ -3122,7 +2905,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:6282
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3132,9 +2915,10 @@ msgid ""
 msgstr ""
 "describe  :: プロパティの詳細表示\n"
 "\n"
-"プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) man ページを参照してください。\n"
+"プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) "
+"man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:6287
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3145,975 +2929,968 @@ msgid ""
 msgstr ""
 "print [property|setting|connection]  :: プロパティ値の表示 (設定、接続)\n"
 "\n"
-"プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させることもできます。\n"
+"プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させ"
+"ることもできます。\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:6295
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
+msgstr ""
+"help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:6388
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続のアクティベートに失敗しました。\n"
 
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:6472
 #, 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:8561
+#: ../clients/cli/connections.c:6490
 #, 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:8597
+#: ../clients/cli/connections.c:6526
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "この接続は保存されません。本当に終了しますか? %s"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:6575
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
-msgstr "この接続プロファイルは別のクライアントからは削除されています。メインメニューで「save」と入力すると元に戻すことができます。\n"
+msgstr ""
+"この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
+"で「save」と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7021
+#: ../clients/cli/connections.c:7079
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティに対して許可されている値: %s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:7025
+#: ../clients/cli/connections.c:7083
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:6619 ../clients/cli/connections.c:6641
+#: ../clients/cli/connections.c:7029 ../clients/cli/connections.c:7088
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:6635
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:6664
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:7180
+#: ../clients/cli/connections.c:7228
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:6691
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:6796
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:6808
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:6825
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "使用可能なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:6833
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティ %s\n"
 
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:6874
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
 "Do you still want to save? %s"
 msgstr ""
-"'autoconnect=yes' でこの接続を保存しています。これにより直ちに接続がアクティベートされる可能性があります。\n"
+"'autoconnect=yes' でこの接続を保存しています。これにより直ちに接続がアクティ"
+"ベートされる可能性があります。\n"
 "本当に保存しますか? %s"
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:6963
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:6991
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
-msgstr "この接続プロファイルは別のクライアントからは削除されています。「save」と入力すると元に戻すことができます。\n"
+msgstr ""
+"この接続プロファイルは別のクライアントからは削除されています。「save」と入力"
+"すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:7033 ../clients/cli/connections.c:7273
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません; 有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:7034
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用してください。\n"
+msgstr ""
+"まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
+"ください。\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7207
+#: ../clients/cli/connections.c:7295
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:7058
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティ用の設定がありません\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:7065
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:7118
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:7141
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティになります: %s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:7185
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:7204
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:7249
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティ、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:7274
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
-"まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使用してください\n"
+"まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
+"用してください\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:7323
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:7355
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:7360
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:7388
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティ: %s%s\n"
 
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:7390
 msgid ", neither a valid setting name"
 msgstr "有効な設定名でもありません。"
 
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:7407
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効な検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:7415
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:7430
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:7433
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的に修正できません\n"
 
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:7450
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:7482
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:7489
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:7490
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) が正常に更新されました。\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:7522
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:7523
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:7524
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:7546
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:7550
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:7560
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:7569
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:9640
-#, c-format
+#: ../clients/cli/connections.c:7575
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:7611
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:7619
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:7627
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:7636
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "エラー: 不正な色: %s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:7650
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:7660
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] が許可されています\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:7877
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:7889 ../clients/cli/connections.c:8050
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:7907
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています;  'タイプ' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:7910
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています; 'con 名' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:7924
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:7926
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:7965
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:7968
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:7970
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:7972
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:7974
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr "プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
+msgstr ""
+"プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:8009
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:8016
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
-#, c-format
-msgid "Error: No arguments provided."
-msgstr "エラー: 引数がありません。"
-
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "エラー: 接続 ID がありません。"
-
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:8098
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
 
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:8162
 msgid "New connection name: "
 msgstr "新規の接続名:"
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:8164
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:8170 ../clients/cli/connections.c:8653
 #, c-format
-msgid "Error: unexpected extra argument '%s'."
-msgstr "エラー: 予期しない追加の引数 '%s' です。"
+msgid "Error: unknown extra argument: '%s'."
+msgstr "エラー: 不明な追加の引数: '%s'。"
 
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:8219
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部の接続が削除されていません。"
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:8220
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続の削除に失敗しました: %s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
-#, c-format
-msgid "Error: unknown connection '%s'\n"
-msgstr "エラー: 不明な接続 '%s'\n"
+#: ../clients/cli/connections.c:8277 ../clients/cli/connections.c:8400
+#, fuzzy, c-format
+msgid "Error: %s.\n"
+msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8401
 #, c-format
-msgid "Error: no connection provided."
-msgstr "エラー: 接続がありません。"
+msgid "Error: not all connections found."
+msgstr "エラー: 一部の接続が見つかりません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:8320
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:8332
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイルが変更されました\n"
 
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:8358
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイルが作成されました\n"
 
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:8367
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイルが削除されました\n"
 
-#: ../clients/cli/connections.c:10548
-#, c-format
-msgid "Error: not all connections found."
-msgstr "エラー: 一部の接続が見つかりません。"
-
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:8428
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: 接続のリロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:8460
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続のロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:8468
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:8477
 msgid "File to import: "
 msgstr "インポートするファイル:"
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:8501
+#, c-format
+msgid "Error: No arguments provided."
+msgstr "エラー: 引数がありません。"
+
+#: ../clients/cli/connections.c:8524
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:8537
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:8539
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明なパラメーター: %s"
 
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:8552
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "エラー: 'タイプ' 引数が必要です。"
+
+#: ../clients/cli/connections.c:8557
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数が必要です。"
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:8564
+#, 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
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:8580
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' のインポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:8650
 msgid "Output file name: "
 msgstr "出力ファイル名:"
 
-#: ../clients/cli/connections.c:10769
-#, c-format
-msgid "Error: unknown extra argument: '%s'."
-msgstr "エラー: 不明な追加の引数: '%s'。"
-
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:8660
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続は VPN ではありません。"
 
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:8681
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
 
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:8690
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:8701
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10976
-#, c-format
-msgid "incorrect string '%s' of '--order' option"
-msgstr "'--order' オプションの正しくない文字列 '%s'"
-
-#: ../clients/cli/connections.c:11002
-#, c-format
-msgid "incorrect item '%s' in '--order' option"
-msgstr "'--order' オプションの正しくないアイテム '%s'"
-
-#: ../clients/cli/connections.c:11089
-msgid "'--order' argument is missing"
-msgstr "'--order' 引数がありません"
-
-#: ../clients/cli/connections.c:11154
-#, c-format
-msgid "Error: '%s' is not valid 'connection' command."
-msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
-
 #. define some prompts
-#: ../clients/cli/devices.c:35
+#: ../clients/cli/devices.c:36
 msgid "Interface: "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:36
+#: ../clients/cli/devices.c:37
+#, fuzzy
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
 #. 3
 #. 20
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:77
 msgid "CONNECTION"
 msgstr "接続"
 
 #. 4
 #. 21
-#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:77
+#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:78
 msgid "CON-UUID"
 msgstr "接続 UUID"
 
 #. 2
-#: ../clients/cli/devices.c:58
+#: ../clients/cli/devices.c:59
 msgid "NM-TYPE"
 msgstr "NM-TYPE"
 
 #. 3
-#: ../clients/cli/devices.c:59
+#: ../clients/cli/devices.c:60
 msgid "VENDOR"
 msgstr "ベンダー"
 
 #. 4
-#: ../clients/cli/devices.c:60
+#: ../clients/cli/devices.c:61
 msgid "PRODUCT"
 msgstr "製品"
 
 #. 5
-#: ../clients/cli/devices.c:61
+#: ../clients/cli/devices.c:62
 msgid "DRIVER"
 msgstr "ドライバー"
 
 #. 6
-#: ../clients/cli/devices.c:62
+#: ../clients/cli/devices.c:63
 msgid "DRIVER-VERSION"
 msgstr "ドライバーバージョン"
 
 #. 7
-#: ../clients/cli/devices.c:63
+#: ../clients/cli/devices.c:64
 msgid "FIRMWARE-VERSION"
 msgstr "ファームウェアバージョン"
 
 #. 8
-#: ../clients/cli/devices.c:64
+#: ../clients/cli/devices.c:65
 msgid "HWADDR"
 msgstr "ハードウェアアドレス"
 
 #. 9
-#: ../clients/cli/devices.c:65 ../clients/tui/nmt-page-ethernet.c:83
-#: ../clients/tui/nmt-page-infiniband.c:94 ../clients/tui/nmt-page-vlan.c:128
+#: ../clients/cli/devices.c:66 ../clients/tui/nmt-page-ethernet.c:83
+#: ../clients/tui/nmt-page-infiniband.c:94
+#: ../clients/tui/nmt-page-ip-tunnel.c:186 ../clients/tui/nmt-page-vlan.c:128
 #: ../clients/tui/nmt-page-wifi.c:370
 msgid "MTU"
 msgstr "MTU"
 
 #. 11
-#: ../clients/cli/devices.c:67
+#: ../clients/cli/devices.c:68
 msgid "REASON"
 msgstr "原因"
 
 #. 12
-#: ../clients/cli/devices.c:68
+#: ../clients/cli/devices.c:69
 msgid "UDI"
 msgstr "UDI"
 
 #. 13
-#: ../clients/cli/devices.c:69
+#: ../clients/cli/devices.c:70
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
 #. 14
 #. 2
-#: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
+#: ../clients/cli/devices.c:71 ../clients/cli/devices.c:103
 msgid "IS-SOFTWARE"
 msgstr "IS-SOFTWARE"
 
 #. 15
-#: ../clients/cli/devices.c:71
+#: ../clients/cli/devices.c:72
 msgid "NM-MANAGED"
 msgstr "NM 管理"
 
 #. 17
-#: ../clients/cli/devices.c:73
+#: ../clients/cli/devices.c:74
 msgid "FIRMWARE-MISSING"
 msgstr "ファームウェア不足"
 
 #. 18
-#: ../clients/cli/devices.c:74
+#: ../clients/cli/devices.c:75
 msgid "NM-PLUGIN-MISSING"
 msgstr "NM-PLUGIN-MISSING"
 
 #. 19
-#: ../clients/cli/devices.c:75
+#: ../clients/cli/devices.c:76
 msgid "PHYS-PORT-ID"
 msgstr "PHYS-PORT-ID"
 
 #. 23
-#: ../clients/cli/devices.c:79
+#: ../clients/cli/devices.c:80
 msgid "METERED"
 msgstr "METERED"
 
 #. 0
-#: ../clients/cli/devices.c:90
+#: ../clients/cli/devices.c:91
 msgid "AVAILABLE-CONNECTION-PATHS"
 msgstr "使用可能な接続パス"
 
 #. 1
-#: ../clients/cli/devices.c:91
+#: ../clients/cli/devices.c:92
 msgid "AVAILABLE-CONNECTIONS"
 msgstr "使用可能な接続"
 
 #. 0
-#: ../clients/cli/devices.c:100
+#: ../clients/cli/devices.c:101
 msgid "CARRIER-DETECT"
 msgstr "キャリア検出"
 
 #. 1
-#: ../clients/cli/devices.c:101
+#: ../clients/cli/devices.c:102
 msgid "SPEED"
 msgstr "速度"
 
 #. 0
-#: ../clients/cli/devices.c:111
+#: ../clients/cli/devices.c:112
 msgid "CARRIER"
 msgstr "キャリア"
 
 #. 1
-#: ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:113
 msgid "S390-SUBCHANNELS"
 msgstr "S390-SUBCHANNELS"
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:827
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../clients/cli/devices.c:122
+#: ../clients/cli/devices.c:123
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
+#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:835
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../clients/cli/devices.c:124
+#: ../clients/cli/devices.c:125
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../clients/cli/devices.c:125
+#: ../clients/cli/devices.c:126
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
+#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:239
 msgid "AP"
 msgstr "AP"
 
 #. 6
-#: ../clients/cli/devices.c:127
+#: ../clients/cli/devices.c:128
 msgid "ADHOC"
 msgstr "アドホック"
 
 #. 7
-#: ../clients/cli/devices.c:128
+#: ../clients/cli/devices.c:129
 msgid "2GHZ"
 msgstr "2GHZ"
 
 #. 8
-#: ../clients/cli/devices.c:129
+#: ../clients/cli/devices.c:130
 msgid "5GHZ"
 msgstr "5GHZ"
 
 #. 0
-#: ../clients/cli/devices.c:138
+#: ../clients/cli/devices.c:139
 msgid "CTR-FREQ"
 msgstr "中心周波数"
 
 #. 1
-#: ../clients/cli/devices.c:139
+#: ../clients/cli/devices.c:140
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../clients/cli/devices.c:140
+#: ../clients/cli/devices.c:141
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../clients/cli/devices.c:141
+#: ../clients/cli/devices.c:142
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../clients/cli/devices.c:142
+#: ../clients/cli/devices.c:143
 msgid "BSID"
 msgstr "BSID"
 
-#. 0
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
-
 #. 1
-#: ../clients/cli/devices.c:152
+#: ../clients/cli/devices.c:153
 msgid "SSID-HEX"
 msgstr "SSID-HEX"
 
 #. 2
-#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:358
+#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:358
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 3
-#: ../clients/cli/devices.c:154
+#: ../clients/cli/devices.c:155
 msgid "MODE"
 msgstr "モード"
 
 #. 4
-#: ../clients/cli/devices.c:155
+#: ../clients/cli/devices.c:156
 msgid "CHAN"
 msgstr "CHAN"
 
 #. 5
-#: ../clients/cli/devices.c:156
+#: ../clients/cli/devices.c:157
 msgid "FREQ"
 msgstr "周波数"
 
 #. 6
-#: ../clients/cli/devices.c:157
+#: ../clients/cli/devices.c:158
 msgid "RATE"
 msgstr "レート"
 
 #. 7
 #. 1
-#: ../clients/cli/devices.c:158 ../clients/cli/devices.c:178
+#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179
 msgid "SIGNAL"
 msgstr "信号"
 
 #. 8
-#: ../clients/cli/devices.c:159
+#: ../clients/cli/devices.c:160
 msgid "BARS"
 msgstr "バー"
 
 #. 9
-#: ../clients/cli/devices.c:160
+#: ../clients/cli/devices.c:161
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. 10
-#: ../clients/cli/devices.c:161
+#: ../clients/cli/devices.c:162
 msgid "WPA-FLAGS"
 msgstr "WPA-フラグ"
 
 #. 11
-#: ../clients/cli/devices.c:162
+#: ../clients/cli/devices.c:163
 msgid "RSN-FLAGS"
 msgstr "RSN-フラグ"
 
 #. 14
-#: ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:166
 msgid "*"
 msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:242
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192
+#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202
 msgid "SLAVES"
 msgstr "スレーブ"
 
+#. 1
+#: ../clients/cli/devices.c:203
+msgid "CONFIG"
+msgstr ""
+
 #. 0
-#: ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:212
 msgid "PARENT"
 msgstr "PARENT"
 
 #. 1
-#: ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:213
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
+#: ../clients/cli/devices.c:222 ../clients/cli/devices.c:237
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../clients/cli/devices.c:227
+#: ../clients/cli/devices.c:238
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 3
-#: ../clients/cli/devices.c:229
+#: ../clients/cli/devices.c:240
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../clients/cli/devices.c:230
+#: ../clients/cli/devices.c:241
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-プロパティ"
 
 #. 10
-#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "ボンド"
 
 #. 11
-#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "team"
 
 #. 12
-#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-bridge.c:74
 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
+msgid "VLAN"
+msgstr "VLAN"
+
 #. 14
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:251
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:252
 msgid "CONNECTIONS"
 msgstr "接続"
 
 #. 1
-#: ../clients/cli/devices.c:253
+#: ../clients/cli/devices.c:264
 msgid "CHASSIS-ID"
 msgstr "CHASSIS-ID"
 
 #. 2
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:265
 msgid "PORT-ID"
 msgstr "PORT-ID"
 
 #. 3
-#: ../clients/cli/devices.c:255
+#: ../clients/cli/devices.c:266
 msgid "PORT-DESCRIPTION"
 msgstr "PORT-DESCRIPTION"
 
 #. 4
-#: ../clients/cli/devices.c:256
+#: ../clients/cli/devices.c:267
 msgid "SYSTEM-NAME"
 msgstr "SYSTEM-NAME"
 
 #. 5
-#: ../clients/cli/devices.c:257
+#: ../clients/cli/devices.c:268
 msgid "SYSTEM-DESCRIPTION"
 msgstr "SYSTEM-DESCRIPTION"
 
 #. 6
-#: ../clients/cli/devices.c:258
+#: ../clients/cli/devices.c:269
 msgid "SYSTEM-CAPABILITIES"
 msgstr "SYSTEM-CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:259
+#: ../clients/cli/devices.c:270
 msgid "IEEE-802-1-PVID"
 msgstr "IEEE-802-1-PVID"
 
 #. 8
-#: ../clients/cli/devices.c:260
+#: ../clients/cli/devices.c:271
 msgid "IEEE-802-1-PPVID"
 msgstr "IEEE-802-1-PPVID"
 
 #. 9
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:272
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr "IEEE-802-1-PPVID-FLAGS"
 
 #. 10
-#: ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:273
 msgid "IEEE-802-1-VID"
 msgstr "IEEE-802-1-VID"
 
 #. 11
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:274
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr "IEEE-802-1-VLAN-NAME"
 
 #. 12
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:275
 msgid "DESTINATION"
 msgstr "DESTINATION"
 
 #. 13
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:276
 msgid "CHASSIS-ID-TYPE"
 msgstr "CHASSIS-ID-TYPE"
 
 #. 14
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:277
 msgid "PORT-ID-TYPE"
 msgstr "PORT-ID-TYPE"
 
-#: ../clients/cli/devices.c:283
-#, c-format
+#: ../clients/cli/devices.c:294
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | connect | reapply | disconnect | delete | "
-"monitor | wifi | lldp }\n"
+"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
+"delete | monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -4123,7 +3900,9 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname> ...\n"
+"  reapply <ifname>\n"
+"\n"
+"  modify <ifname> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4148,8 +3927,8 @@ msgid ""
 msgstr ""
 "使い方: nmcli device { コマンド | help }\n"
 "\n"
-"コマンド := { status | show | connect | reapply | disconnect | delete | monitor "
-"| wifi | lldp }\n"
+"コマンド := { status | show | connect | reapply | disconnect | delete | "
+"monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -4182,7 +3961,7 @@ msgstr ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:305
+#: ../clients/cli/devices.c:317
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -4193,8 +3972,10 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
 msgstr ""
 "使い方: nmcli device status { help }\n"
@@ -4205,12 +3986,13 @@ msgstr ""
 " タイプ       - デバイスタイプ\n"
 " 状態      - デバイスの状態\n"
 " 接続 - デバイス上でアクティブにしている接続があればそれを表示\n"
-"'--fields' グローバルオプションを使用すると表示させる項目を変更することができます。\n"
-"'status' はデフォルトのコマンドで、'nmcli device' を実行すると 'nmcli device status' "
-"を実行したことになります。\n"
+"'--fields' グローバルオプションを使用すると表示させる項目を変更することができ"
+"ます。\n"
+"'status' はデフォルトのコマンドで、'nmcli device' を実行すると 'nmcli device "
+"status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:320
+#: ../clients/cli/devices.c:332
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -4229,7 +4011,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:331
+#: ../clients/cli/devices.c:343
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -4237,8 +4019,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -4251,12 +4033,12 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:343
-#, c-format
+#: ../clients/cli/devices.c:355
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4270,7 +4052,50 @@ msgstr ""
 "でデバイスの更新を試行します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:354
+#: ../clients/cli/devices.c:366
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device modify { ARGUMENTS | --help }\n"
+"\n"
+"ARGUMENTS := <ifname> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"Modify one or more properties currently active on the device without "
+"modifying\n"
+"the connection profile. The changes have immediate effect. For multi-valued\n"
+"properties you can use optional '+' or '-' prefix to the property name.\n"
+"The '+' sign allows appending items instead of overwriting the whole value.\n"
+"The '-' sign allows removing selected items instead of the whole value.\n"
+"\n"
+"Examples:\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
+"nmcli dev mod em1 -ipv4.dns 1\n"
+"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
+msgstr ""
+"使い方: nmcli connection modify { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"接続プロファイルの 1 つ以上のプロパティーを変更します。\n"
+"プロファイルは名前、UUID、または D-Bus パスで識別されます。複数の値から成るプ"
+"ロパティーの場合は、\n"
+"プロパティー名にオプションの '+' または '-' プレフィックスを使用できます。\n"
+"'+' 記号を使用すると、値全体を上書きせずにアイテムを追加できます。\n"
+"'-' 記号を使用すると、値全体の代わりに、選択されたアイテムを削除できます。\n"
+"\n"
+"例:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
+
+#: ../clients/cli/devices.c:386
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4287,11 +4112,12 @@ msgstr ""
 "引数 := <ifname> ...\n"
 "\n"
 "デバイスの接続を切断します。\n"
-"このコマンドにより、デバイスの接続が切断され、ユーザーまたは手作業による介入なしで\n"
+"このコマンドにより、デバイスの接続が切断され、ユーザーまたは手作業による介入"
+"なしで\n"
 "それ以降の接続が自動アクティベートされることが防がれます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:366
+#: ../clients/cli/devices.c:398
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4314,7 +4140,7 @@ msgstr ""
 "コマンドで削除できません。\n"
 "\n"
 
-#: ../clients/cli/devices.c:379
+#: ../clients/cli/devices.c:411
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4337,7 +4163,7 @@ msgstr ""
 "デバイスプロパティーを変更します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:392
+#: ../clients/cli/devices.c:424
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4354,12 +4180,13 @@ msgstr ""
 "引数 := [<ifname>] ...\n"
 "\n"
 "デバイスアクティビティーを監視します。\n"
-"このコマンドにより、指定されたデバイスの状態が変わるたびに行が出力されます。\n"
+"このコマンドにより、指定されたデバイスの状態が変わるたびに行が出力されま"
+"す。\n"
 "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:404
-#, c-format
+#: ../clients/cli/devices.c:436
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -4370,9 +4197,9 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
+"                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
 "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
@@ -4384,9 +4211,8 @@ msgid ""
 "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
 "assumed that IP configuration is obtained via DHCP.\n"
 "\n"
-"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
-"                          [band a|bg] [channel <channel>] [password "
-"<password>]\n"
+"ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                     [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
 "to stop the hotspot.\n"
@@ -4400,8 +4226,10 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4415,21 +4243,28 @@ msgstr ""
 "\n"
 "引数 := [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
-"使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' オプションと 'bssid' オプションを使用すると、\n"
-"特定のインターフェース用の AP または特定の BSSID を持つ AP を一覧表示することができます。\n"
+"使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' オプションと "
+"'bssid' オプションを使用すると、\n"
+"特定のインターフェース用の AP または特定の BSSID を持つ AP を一覧表示すること"
+"ができます。\n"
 "\n"
-"引数 := connect <(B)SSID> [password <パスワード>] [wep-key-type key|phrase] [ifname "
-"<ifname>]\n"
+"引数 := connect <(B)SSID> [password <パスワード>] [wep-key-type key|phrase] "
+"[ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <名前>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
-"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。このコマンドにより新規の\n"
+"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。このコマンドによ"
+"り新規の\n"
 "接続が作成され、デバイス上でアクティベートされます。これは、GUI\n"
-"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続が\n"
+"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続"
+"が\n"
 "作成されるため、主に新規の Wi-Fi ネットワークに接続する場合に役に立ちます。\n"
-"ネットワーク用の接続がすでに存在する場合は、「nmcli con up id <名前>」を使って\n"
-"既存のプロファイルを有効にすることが推奨されます。現時点でサポートされているのはオープンな\n"
-"WEP ネットワークおよび WPA-PSK  ネットワークのみであることに注意してください。また、\n"
+"ネットワーク用の接続がすでに存在する場合は、「nmcli con up id <名前>」を使っ"
+"て\n"
+"既存のプロファイルを有効にすることが推奨されます。現時点でサポートされている"
+"のはオープンな\n"
+"WEP ネットワークおよび WPA-PSK  ネットワークのみであることに注意してくださ"
+"い。また、\n"
 "IP 設定は DHCP で取得されるとみなされます。\n"
 "\n"
 "ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
@@ -4448,8 +4283,10 @@ msgstr ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
@@ -4457,14 +4294,15 @@ msgstr ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 
-#: ../clients/cli/devices.c:451
+#: ../clients/cli/devices.c:483
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
 msgstr ""
@@ -4472,508 +4310,517 @@ msgstr ""
 "\n"
 "引数 := [list [ifname <ifname>]]\n"
 "\n"
-"LLDP を介して検出された近接デバイスを一覧表示します。'ifname' オプションを使用すると、\n"
+"LLDP を介して検出された近接デバイスを一覧表示します。'ifname' オプションを使"
+"用すると、\n"
 "特定のインターフェースの近接デバイスを一覧表示できます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:584
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:607
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' が重複しています。\n"
 
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:610
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:611
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部のデバイスが見つかりません。"
 
-#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
+#: ../clients/cli/devices.c:640
+#, fuzzy
+msgid "No interface specified"
+msgstr "エラー: インターフェースが指定されていません。"
+
+#: ../clients/cli/devices.c:659
+#, fuzzy, c-format
+msgid "Device '%s' not found"
+msgstr "エラー: デバイス'%s' が見つかりません"
+
+#: ../clients/cli/devices.c:745 ../clients/cli/devices.c:897
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../clients/cli/devices.c:719
+#: ../clients/cli/devices.c:815
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:720
+#: ../clients/cli/devices.c:816
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:735
+#: ../clients/cli/devices.c:831
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:840
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:760
+#: ../clients/cli/devices.c:856
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:761
+#: ../clients/cli/devices.c:857
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:762
+#: ../clients/cli/devices.c:858
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:916
+#: ../clients/cli/devices.c:1082
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:928
+#: ../clients/cli/devices.c:1094
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
+#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1149
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1190
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1281
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1281
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/devices.c:1342
+#: ../clients/cli/devices.c:1519
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1349
+#: ../clients/cli/devices.c:1525
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2013
+#: ../clients/cli/devices.c:3741
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:461
 #, c-format
-msgid "Error: Device '%s' not found."
-msgstr "エラー: デバイス'%s' が見つかりません"
+msgid "Error: Timeout %d sec expired."
+msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/devices.c:1475
+#: ../clients/cli/devices.c:1645
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1481
+#: ../clients/cli/devices.c:1651
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1517
+#: ../clients/cli/devices.c:1687
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1520
+#: ../clients/cli/devices.c:1690
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:1700
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
 
-#: ../clients/cli/devices.c:1532
+#: ../clients/cli/devices.c:1702
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
 
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1714
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
+msgstr ""
+"UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1547
+#: ../clients/cli/devices.c:1717
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "ホットスポット '%s' がデバイス '%s' でアクティベートされました\n"
 
-#: ../clients/cli/devices.c:1611
+#: ../clients/cli/devices.c:1781
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1620
+#: ../clients/cli/devices.c:1790
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
+msgstr ""
+"エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
 
-#: ../clients/cli/devices.c:1635
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "デバイス '%s'  は接続されています。\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1845
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1917 ../clients/cli/devices.c:1932
+#: ../clients/cli/devices.c:2160
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:1779
+#: ../clients/cli/devices.c:1920
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:1838
-#, c-format
-msgid "Error: not all connections reapplied."
-msgstr "エラー: 一部の接続が再適用されませんでした。"
-
-#: ../clients/cli/devices.c:1839
-#, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+#: ../clients/cli/devices.c:1979 ../clients/cli/devices.c:2048
+#, fuzzy, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1989 ../clients/cli/devices.c:2057
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
 
-#: ../clients/cli/devices.c:1912
-#, c-format
-msgid "Error: no valid device provided."
-msgstr "エラー: 有効なデバイスが提供されていません。"
+#: ../clients/cli/devices.c:2082
+#, fuzzy, c-format
+msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
+msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:2145
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部のデバイスが切断されませんでした。"
 
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:2146
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2223
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部のデバイスが削除されませんでした。"
 
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2224
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2308
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティーが指定されていません。"
 
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2321 ../clients/cli/devices.c:2336
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2327
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2342
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "エラー: '自動接続': %s。"
+
+#: ../clients/cli/devices.c:2350
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' が不明です。"
 
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2400
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2426
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デバイスが作成されました\n"
 
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2433
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デバイスが削除されました\n"
 
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2630
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2674
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2685
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "エラー: デバイス'%s' が見つかりません"
+
+#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2788
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2732
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr ""
-"エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。NetworkManager Wi-Fi "
-"プラグインを確認してください。"
+"エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
+"NetworkManager Wi-Fi プラグインを確認してください。"
 
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2736 ../clients/cli/devices.c:2998
+#: ../clients/cli/devices.c:3421 ../clients/cli/devices.c:3576
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2863
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2868
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2900
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2926
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用してください。"
+msgstr ""
+"エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
+"てください。"
 
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2948 ../clients/cli/devices.c:2963
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2981
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
+msgstr ""
+"エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2987
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:3000 ../clients/cli/devices.c:3423
+#: ../clients/cli/devices.c:3578
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:3020
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
 
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:3047
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:3091
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr "警告: '%s' は非表示の AP の SSID である必要がありますが、BSSID のようです。\n"
+msgstr ""
+"警告: '%s' は非表示の AP の SSID である必要がありますが、BSSID のようです。\n"
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:3105
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3254
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' は有効な WPA PSK ではありません"
 
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3271
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要があります)"
+msgstr ""
+"'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要"
+"があります)"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3287
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットスポットのパスワード: %s\n"
 
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid が長すぎます。"
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3363
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
+msgstr ""
+"エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3384
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3405
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: チャネルにはバンドも必要です。"
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3410
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: チャンネル '%s' はバンド '%s' に対して有効ではありません。"
 
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3434
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "エラー: デバイス '%s' は AP またはアドホックモードのいずれもサポートしません。"
+msgstr ""
+"エラー: デバイス '%s' は AP またはアドホックモードのいずれもサポートしませ"
+"ん。"
 
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3468
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効なパスワード: %s。"
 
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3542
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返すことはできません。"
 
-#: ../clients/cli/devices.c:3399
-#, c-format
-msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
-
 #. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3651
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デバイス"
 
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3759
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
 
-#: ../clients/cli/devices.c:3575
-#, c-format
-msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "エラー: 'device lldp' コマンドは '%s' 有効ではありません。"
-
-#: ../clients/cli/devices.c:3770
-#, c-format
-msgid "Error: 'dev' command '%s' is not valid."
-msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
-
-#: ../clients/cli/general.c:34
+#: ../clients/cli/general.c:37
 msgid "RUNNING"
 msgstr "実行中"
 
 #. 0
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:38
 msgid "VERSION"
 msgstr "バージョン"
 
 #. 2
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:40
 msgid "STARTUP"
 msgstr "スタートアップ"
 
 #. 3
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:41
 msgid "CONNECTIVITY"
 msgstr "接続性"
 
 #. 4
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:42
 msgid "NETWORKING"
 msgstr "ネットワーキング"
 
 #. 5
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:43
 msgid "WIFI-HW"
 msgstr "WIFI ハードウェア"
 
 #. 6
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:44
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:45
 msgid "WWAN-HW"
 msgstr "WWAN ハードウェア"
 
 #. 8
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:46
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:47
 msgid "WIMAX-HW"
 msgstr "WIMAX ハードウェア"
 
 #. 10
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:48
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:61
+#: ../clients/cli/general.c:64
 msgid "PERMISSION"
 msgstr "パーミッション"
 
 #. 0
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:65
 msgid "VALUE"
 msgstr "値"
 
-#: ../clients/cli/general.c:70
+#: ../clients/cli/general.c:73
 msgid "LEVEL"
 msgstr "レベル"
 
 #. 0
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:74
 msgid "DOMAINS"
 msgstr "ドメイン"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:88
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -5002,7 +4849,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:96
+#: ../clients/cli/general.c:99
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -5015,10 +4862,11 @@ msgstr ""
 "使い方: nmcli general status { help }\n"
 "\n"
 "NetworkManager の全般情報を表示します。\n"
-"'status' はデフォルトの動作となるため、'nmcli gen' を実行すると 'nmcli gen status' を実行したことになります。\n"
+"'status' はデフォルトの動作となるため、'nmcli gen' を実行すると 'nmcli gen "
+"status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/general.c:105
+#: ../clients/cli/general.c:108
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -5027,8 +4875,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
 msgstr ""
 "使い方: nmcli general hostname { 引数 | help }\n"
@@ -5036,11 +4884,12 @@ msgstr ""
 "引数 := [<ホスト名>]\n"
 "\n"
 "システムの永続的なホスト名を取得または変更します。\n"
-"引数を付けずに実行すると現在、設定されているホスト名を出力します。ホスト名を\n"
+"引数を付けずに実行すると現在、設定されているホスト名を出力します。ホスト名"
+"を\n"
 "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
 "\n"
 
-#: ../clients/cli/general.c:117
+#: ../clients/cli/general.c:120
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -5053,7 +4902,7 @@ msgstr ""
 "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
 "\n"
 
-#: ../clients/cli/general.c:125
+#: ../clients/cli/general.c:128
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -5078,7 +4927,7 @@ msgstr ""
 "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
 "\n"
 
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:141
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -5103,29 +4952,33 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:148
+#: ../clients/cli/general.c:151
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr "使い方: nmcli networking on { help }\n"
+msgstr ""
+"使い方: nmcli networking on { help }\n"
 "\n"
 "ネットワークをオンに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:156
+#: ../clients/cli/general.c:159
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr "使い方: nmcli networking off { help }\n"
+msgstr ""
+"使い方: nmcli networking off { help }\n"
 "\n"
 "ネットワークをオフに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:164
+#: ../clients/cli/general.c:167
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -5133,8 +4986,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
 msgstr ""
 "使い方: nmcli networking connectivity { 引数 | help }\n"
@@ -5144,7 +4997,7 @@ msgstr ""
 "ネットワークの接続状態を取得します。\n"
 "オプションの 'check' 引数を付けると接続を再チェックします。\n"
 
-#: ../clients/cli/general.c:176
+#: ../clients/cli/general.c:179
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -5161,7 +5014,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:185
+#: ../clients/cli/general.c:188
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -5178,7 +5031,7 @@ msgstr ""
 "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:195
+#: ../clients/cli/general.c:198
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -5195,7 +5048,7 @@ msgstr ""
 "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:205
+#: ../clients/cli/general.c:208
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -5209,10 +5062,11 @@ msgstr ""
 "\n"
 "引数 := [on | off]\n"
 "\n"
-"モバイルブロードバンドのラジオスイッチの状態を取得、またはオンかオフにします。\n"
+"モバイルブロードバンドのラジオスイッチの状態を取得、またはオンかオフにしま"
+"す。\n"
 "\n"
 
-#: ../clients/cli/general.c:215
+#: ../clients/cli/general.c:218
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -5227,212 +5081,275 @@ msgstr ""
 "NetworkManager で変更が行われるたびに行を出力します。\n"
 "\n"
 
-#: ../clients/cli/general.c:233
+#: ../clients/cli/general.c:236
 msgid "asleep"
 msgstr "休止中"
 
-#: ../clients/cli/general.c:235
+#: ../clients/cli/general.c:238
 msgid "connecting"
 msgstr "接続中"
 
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:240
 msgid "connected (local only)"
 msgstr "接続完了 (ローカルのみ)"
 
-#: ../clients/cli/general.c:239
+#: ../clients/cli/general.c:242
 msgid "connected (site only)"
 msgstr "接続完了 (サイトのみ)"
 
-#: ../clients/cli/general.c:243
+#: ../clients/cli/general.c:246
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:279
+#: ../clients/cli/general.c:282
 msgid "portal"
 msgstr "ポータル"
 
-#: ../clients/cli/general.c:281
+#: ../clients/cli/general.c:284
 msgid "limited"
 msgstr "制限付き"
 
-#: ../clients/cli/general.c:283
+#: ../clients/cli/general.c:286
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:334
+#: ../clients/cli/general.c:337
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 許可されているのは次のフィールドのみです: %s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:352
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:357
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:360
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:360
 msgid "started"
 msgstr "起動しました"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:362 ../clients/cli/general.c:363
+#: ../clients/cli/general.c:364 ../clients/cli/general.c:365
+#: ../clients/cli/general.c:366
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:362 ../clients/cli/general.c:363
+#: ../clients/cli/general.c:364 ../clients/cli/general.c:365
+#: ../clients/cli/general.c:366
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:450
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:491
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:497
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:607
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:621
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:567
-#, c-format
-msgid "Error: failed to set hostname: %s"
-msgstr "エラー: ホスト名の設定に失敗しました: %s"
-
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:670
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギングの設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:687
 #, c-format
-msgid "Error: 'general' command '%s' is not valid."
-msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
+msgid "Error: failed to set hostname: %s"
+msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:753
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "エラー: '--fields' の値 '%s' はここでは無効です (許可フィールド: %s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:778
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
-#: ../clients/cli/general.c:743
+#. no arguments -> get current state
+#: ../clients/cli/general.c:823 ../clients/cli/general.c:835
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:758
-msgid "Networking"
-msgstr "ネットワーキング"
-
-#: ../clients/cli/general.c:783
-#, c-format
-msgid "Error: 'networking connectivity' command '%s' is not valid."
-msgstr "エラー: 'networking connectivity' のコマンド '%s' は有効なコマンドではありません。"
-
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:838
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "エラー: 'networking' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:851
+msgid "Networking"
+msgstr "ネットワーキング"
+
+#: ../clients/cli/general.c:889
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:918
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:944
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:893
-#, c-format
-msgid "Error: 'radio' command '%s' is not valid."
-msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
-
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:991
 msgid "NetworkManager has started"
 msgstr "NetworkManager  が起動されました"
 
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:991
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager が停止しました"
 
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:1002
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト名が '%s' に設定されました\n"
 
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:1017
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' はプライマリー接続です\n"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:1019
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続がありません\n"
 
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:1031
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性は '%s' です\n"
 
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:1044
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager の状態は '%s' です\n"
 
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:1065
+#, fuzzy
+msgid "connection available"
+msgstr "接続に失敗"
+
+#: ../clients/cli/general.c:1067
+#, fuzzy
+msgid "connections available"
+msgstr "接続に失敗"
+
+#: ../clients/cli/general.c:1085
+#, fuzzy
+msgid "autoconnect"
+msgstr "接続済み"
+
+#: ../clients/cli/general.c:1087
+#, fuzzy
+msgid "fw missing"
+msgstr "データがありません"
+
+#: ../clients/cli/general.c:1092
+#, fuzzy
+msgid "plugin missing"
+msgstr "データがありません"
+
+#: ../clients/cli/general.c:1097
+msgid "sw"
+msgstr ""
+
+#: ../clients/cli/general.c:1099
+#, fuzzy
+msgid "hw"
+msgstr "表示する"
+
+#: ../clients/cli/general.c:1104
+msgid "iface"
+msgstr ""
+
+#: ../clients/cli/general.c:1107
+#, fuzzy
+msgid "port"
+msgstr "ポータル"
+
+#: ../clients/cli/general.c:1110
+msgid "mtu"
+msgstr ""
+
+#: ../clients/cli/general.c:1127
+#, fuzzy
+msgid "master"
+msgstr "マスター: "
+
+#: ../clients/cli/general.c:1133
+#, fuzzy
+msgid "ip4 default"
+msgstr "デフォルト"
+
+#: ../clients/cli/general.c:1135
+#, fuzzy
+msgid "ip6 default"
+msgstr "デフォルト"
+
+#: ../clients/cli/general.c:1213
+#, fuzzy, c-format
+msgid "%s VPN connection"
+msgstr "VPN 接続"
+
+#: ../clients/cli/general.c:1283
+#, c-format
+msgid ""
+"Use \"nmcli device show\" to get complete information about known devices "
+"and\n"
+"\"nmcli connection show\" to get an overview on active connection profiles.\n"
+"\n"
+"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"details.\n"
+msgstr ""
+
+#: ../clients/cli/general.c:1302
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
 
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:1314
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager が実行されていません (待機中)\n"
 
-#: ../clients/cli/nmcli.c:83
-#, c-format
+#: ../clients/cli/nmcli.c:181
+#, fuzzy, c-format
 msgid ""
-"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"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 output\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"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5458,12 +5375,15 @@ msgstr ""
 "  -m[ode] tabular|multiline                  出力モード\n"
 "  -c[olors] auto|yes|no                      出力で色を使用するかどうか\n"
 "  -f[ields] <field1,field2,...>|all|common   出力フィールドの指定\n"
-"  -e[scape] yes|no                           値内のコラムセパレーターをエスケープ\n"
-"  -n[ocheck]                                 nmcli および NetworkManager "
-"のバージョンをチェックしない\n"
-"  -a[sk]                                     足りないパラメーターを問い合わせる\n"
+"  -e[scape] yes|no                           値内のコラムセパレーターをエス"
+"ケープ\n"
+"  -n[ocheck]                                 nmcli および NetworkManager の"
+"バージョンをチェックしない\n"
+"  -a[sk]                                     足りないパラメーターを問い合わせ"
+"る\n"
 "  -s[how-secrets]                            パスワードの表示を許可\n"
-"  -w[ait] <seconds>                          動作の完了を待機する場合のタイムアウトを設定\n"
+"  -w[ait] <seconds>                          動作の完了を待機する場合のタイム"
+"アウトを設定\n"
 "  -v[ersion]                                 プログラムバージョンを表示\n"
 "  -h[elp]                                    このヘルプを出力\n"
 "\n"
@@ -5473,90 +5393,71 @@ msgstr ""
 "  r[adio]         NetworkManager ラジオスイッチ\n"
 "  c[onnection]    NetworkManager の接続\n"
 "  d[evice]        NetworkManager で管理しているデバイス\n"
-"  a[gent]         NetworkManager シークレットエージェントまたは polkit エージェント\n"
+"  a[gent]         NetworkManager シークレットエージェントまたは polkit エー"
+"ジェント\n"
 "  m[onitor]       NetworkManager の変更を監視\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:143
-#, c-format
-msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
-
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:258
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:263
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:276
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:285 ../clients/cli/nmcli.c:302
+#: ../clients/cli/nmcli.c:321 ../clients/cli/nmcli.c:354
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:296 ../clients/cli/nmcli.c:315
+#: ../clients/cli/nmcli.c:332
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:338
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:359
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "エラー: '%s' は '%s' オプションの有効なタイムアウトではありません。"
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:367
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:374
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
-#, c-format
-msgid "\n"
-"Error: nmcli terminated by signal %s (%d)\n"
-msgstr "\n"
+#: ../clients/cli/nmcli.c:419 ../clients/cli/nmcli.c:426
+#, fuzzy, c-format
+msgid "Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
+"\n"
 "Error: nmcli がシグナル %s (%d) で終了しました\n"
 
-#: ../clients/cli/nmcli.c:408
-#, c-format
-msgid "Failed to set signal mask: %d\n"
-msgstr "シグナルマスクの設定に失敗しました: %d\n"
-
-#: ../clients/cli/nmcli.c:415
-#, c-format
-msgid "Failed to create signal handling thread: %d\n"
-msgstr "シグナル処理スレッドの作成に失敗しました: %d\n"
-
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
-#, c-format
-msgid "Error: Could not create NMClient object: %s."
-msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
-
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:524
 msgid "Success"
 msgstr "成功"
 
@@ -5575,290 +5476,320 @@ msgstr "認証エラー: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
 
-#: ../clients/cli/settings.c:790
+#: ../clients/cli/settings.c:820
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/cli/settings.c:792
+#: ../clients/cli/settings.c:822
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:825 ../clients/cli/settings.c:911
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:824
+#: ../clients/cli/settings.c:854
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:860
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/cli/settings.c:832
+#: ../clients/cli/settings.c:862
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/cli/settings.c:834
+#: ../clients/cli/settings.c:864
 msgid "LOOSE_BINDING, "
 msgstr "結合を緩める、"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:866
 msgid "MVRP, "
 msgstr "MVRP、"
 
-#: ../clients/cli/settings.c:875
+#: ../clients/cli/settings.c:905
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (無効)"
 
-#: ../clients/cli/settings.c:877
+#: ../clients/cli/settings.c:907
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (有効、パブリック IP 優先)"
 
-#: ../clients/cli/settings.c:879
+#: ../clients/cli/settings.c:909
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (有効、テンポラリ IP を優先)"
 
-#: ../clients/cli/settings.c:894
+#: ../clients/cli/settings.c:924
 #, c-format
 msgid "%d (no)"
 msgstr "%d (no)"
 
-#: ../clients/cli/settings.c:896
+#: ../clients/cli/settings.c:926
 #, c-format
 msgid "%d (yes)"
 msgstr "%d (yes)"
 
-#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#: ../clients/cli/settings.c:929 ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1692
 #, c-format
 msgid "%d (default)"
 msgstr "%d (default)"
 
-#: ../clients/cli/settings.c:912
+#: ../clients/cli/settings.c:942
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:948
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/cli/settings.c:920
+#: ../clients/cli/settings.c:950
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/cli/settings.c:922
+#: ../clients/cli/settings.c:952
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:1001 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: ../clients/cli/settings.c:1252
+#. ----------------------------------------------------------------------------
+#: ../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:1258
+#: ../clients/cli/settings.c:1395
 msgid "enabled, "
 msgstr "有効、"
 
-#: ../clients/cli/settings.c:1260
+#: ../clients/cli/settings.c:1397
 msgid "advertise, "
 msgstr "公表、"
 
-#: ../clients/cli/settings.c:1262
+#: ../clients/cli/settings.c:1399
 msgid "willing, "
 msgstr "用意がある、"
 
-#: ../clients/cli/settings.c:1290
+#: ../clients/cli/settings.c:1427
 msgid "-1 (unset)"
 msgstr "-1 (未設定)"
 
-#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
-#: ../clients/cli/settings.c:1864
+#: ../clients/cli/settings.c:1559 ../clients/cli/settings.c:1887
+#: ../clients/cli/settings.c:2028
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
+#: ../clients/cli/settings.c:1572 ../clients/cli/settings.c:2059
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/cli/settings.c:1556
+#: ../clients/cli/settings.c:1694
 #, c-format
 msgid "%d (off)"
 msgstr "%d (off)"
 
-#: ../clients/cli/settings.c:1770
+#: ../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' の組み合わせを使用してください"
+msgstr ""
+"無効なオプション '%s' です。[%s]、'ignore'、'default'、または 'none' の組み合"
+"わせを使用してください"
 
-#: ../clients/cli/settings.c:1781
+#: ../clients/cli/settings.c:1944
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr "'default' と 'ignore' は他のフラグと使用できません"
 
-#: ../clients/cli/settings.c:1817
+#: ../clients/cli/settings.c:1980
 #, c-format
 msgid "invalid mode '%s', use one of %s"
 msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
 
-#: ../clients/cli/settings.c:1899
+#: ../clients/cli/settings.c:2063
 #, c-format
 msgid "always"
 msgstr "always"
 
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
-#: ../libnm-core/nm-keyfile-reader.c:573
+#: ../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
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
 
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2236
+#, fuzzy, c-format
+msgid "invalid method '%s', use one of %s"
+msgstr "無効なモード '%s' です。%s のいずれかを使用してください"
+
+#: ../clients/cli/settings.c:2332
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "'%s' を '%s' に設定しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2334
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s' も消去しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2279
+#: ../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"
+msgstr ""
+"警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視さ"
+"れることがあります\n"
 
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2529
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr "警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
+msgstr ""
+"警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
 
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2531
 msgid "Do you want to remove them? [yes] "
 msgstr "削除しますか? [yes] "
 
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2677 ../clients/cli/settings.c:3072
+#: ../clients/cli/settings.c:5508
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2700
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2722
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "'%lld' は有効ではありません。<%lld-%lld> を使用してください"
 
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2744
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "'%u' は有効ではありません。<%u-%u> を使用してください"
 
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2783
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
 
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2850
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2884
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "インデックス '%s' は無効です"
 
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2889 ../clients/cli/settings.c:2914
 msgid "no item to remove"
 msgstr "削除するアイテムがありません"
 
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../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:2652
+#: ../clients/cli/settings.c:2933
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無効なオプション '%s'"
 
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2935
 msgid "missing option"
 msgstr "足りないオプション"
 
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2962 ../clients/cli/settings.c:2982
+#: ../clients/cli/settings.c:3002 ../clients/cli/settings.c:3022
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:3056
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "'%s' は有効な値ではありません。-1、0、または 1 を使用してください"
 
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:3089
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
-#: ../libnm-core/nm-setting-infiniband.c:255
-#: ../libnm-util/nm-setting-connection.c:834
-#: ../libnm-util/nm-setting-infiniband.c:269
-#, c-format
-msgid "'%s' is not a valid interface name"
-msgstr "'%s' は有効なインターフェース名ではありません"
-
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:3148
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "'%s' は有効なフラグ番号ではありません。<0-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:3160
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr "警告: 合計 '%s' がすべてのフラグよりも大きいです => すべてのフラグが設定されています\n"
+msgstr ""
+"警告: 合計 '%s' がすべてのフラグよりも大きいです => すべてのフラグが設定され"
+"ています\n"
 
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:3211
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:3241
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' は有効な MAC ではありません"
 
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#. 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:3032
+#: ../clients/cli/settings.c:3360
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "プロパティーにはパーミッション '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3372
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"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"
@@ -5870,39 +5801,41 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3391
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
+msgstr ""
+"'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
 
-#: ../clients/cli/settings.c:3107
+#: ../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:3111 ../clients/cli/settings.c:3127
+#: ../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:3120
+#: ../clients/cli/settings.c:3448
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' は既存のプロファイルの名前ではありません"
 
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3482
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "値 '%s' は有効な UUID ではありません"
 
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3489
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "プロパティーには UUID '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3501
 msgid ""
-"Enter secondary connections that should be activated when this connection is\n"
+"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"
@@ -5912,14 +5845,16 @@ msgid ""
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
 "この接続がアクティベートされたときにアクティベートする必要がある\n"
-"セカンダリー接続を入力してください。接続は UUID または ID (名前) のいずれかで指定できます。nmcli\n"
-"は名前を透過的に UUID に変換します。NetworkManager は現時点では VPN をセカンダリー接続\n"
+"セカンダリー接続を入力してください。接続は UUID または ID (名前) のいずれかで"
+"指定できます。nmcli\n"
+"は名前を透過的に UUID に変換します。NetworkManager は現時点では VPN をセカン"
+"ダリー接続\n"
 "としてのみサポートします。\n"
 "項目はカンマまたはスペースで区切ることができます。\n"
 "\n"
 "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3240
+#: ../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"
@@ -5931,47 +5866,48 @@ msgstr ""
 "示す値を入力します。使用できるオプション:\n"
 "接続を測定対象として設定する場合は 'true'、'yes'、'on'\n"
 "接続を非測定として設定する場合は 'false'、'no'、'off'\n"
-"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は 'unknown'\n"
-
-#: ../clients/cli/settings.c:3364
-msgid "private key password not provided"
-msgstr "プライベートキーのパスワードが入力されていません"
+"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
+"'unknown'\n"
 
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3717
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "プロパティーには EAP メソッド '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3734
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
-"CA 証明書へのファイルパスを入力します (オプションで file:// を先頭に指定できます)。\n"
+"CA 証明書へのファイルパスを入力します (オプションで file:// を先頭に指定でき"
+"ます)。\n"
 "  [file://]<ファイルパス>\n"
-"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してくださ"
+"い。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3753
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3769
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
-"クライアント証明書へのファイルパスを入力します (オプションで file:// を先頭に指定できます)。\n"
+"クライアント証明書へのファイルパスを入力します (オプションで file:// を先頭に"
+"指定できます)。\n"
 "  [file://]<ファイルパス>\n"
-"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してくださ"
+"い。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3781
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5980,18 +5916,21 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
-"内部認証のために CA 証明書へのファイルパスを入力します (オプションで file:// を\n"
+"内部認証のために CA 証明書へのファイルパスを入力します (オプションで file:// "
+"を\n"
 "先頭に指定できます)。\n"
 "  [file://]<ファイルパス>\n"
-"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してくださ"
+"い。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3801
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
+msgstr ""
+"プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3817
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6000,29 +5939,34 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
-"内部認証のためにクライアント証明書へのファイルパスを入力します (オプションで file:// を\n"
+"内部認証のためにクライアント証明書へのファイルパスを入力します (オプションで "
+"file:// を\n"
 "先頭に指定できます)。\n"
 "  [file://]<ファイルパス>\n"
-"nmcli では証明書をロー blob データとして指定できないことに注意してください。\n"
+"nmcli では証明書をロー blob データとして指定できないことに注意してくださ"
+"い。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3837
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
-"プライベートキーへのパスとキーパスワード (まだ設定していない場合) を入力してください:\n"
+"プライベートキーへのパスとキーパスワード (まだ設定していない場合) を入力して"
+"ください:\n"
 "  [file://]<ファイルパス> [<パスワード>]\n"
-"nmcli ではプライベートキーをロー blob データとして指定できないことに注意してください。\n"
+"nmcli ではプライベートキーをロー blob データとして指定できないことに注意して"
+"ください。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3908
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -6032,12 +5976,13 @@ msgstr ""
 "16 進値の一覧のバイトを入力してください。\n"
 "入力できる形式は 2 種類あります。\n"
 "(a) 16 進の数字から成る列、2 桁で 1 バイト\n"
-"(b) 空白で区切った 16 進の数字の並び (オプションで 0x/0X プレフィックス、および先行の 0 を使用可能)\n"
+"(b) 空白で区切った 16 進の数字の並び (オプションで 0x/0X プレフィックス、およ"
+"び先行の 0 を使用可能)\n"
 "\n"
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:4029
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6068,56 +6013,57 @@ msgstr ""
 "\n"
 "例: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:4060
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' は有効な InfiniBand MAC ではありません"
 
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:4097
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:4128
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "'%s' は無効です (書式: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:4176 ../clients/cli/settings.c:4195
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:4201 ../clients/cli/settings.c:4509
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "プロパティーには DNS サーバー '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:4213
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr "DNS サーバーの IPv4 アドレス一覧を入力してください。\n"
+msgstr ""
+"DNS サーバーの IPv4 アドレス一覧を入力してください。\n"
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:4249 ../clients/cli/settings.c:4563
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
 
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:4287 ../clients/cli/settings.c:4601
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "プロパティーには DNS オプション '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4341 ../clients/cli/settings.c:4654
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "プロパティーには IP アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4354
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6131,17 +6077,17 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4370 ../clients/cli/settings.c:4683
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効なゲートウェイアドレス '%s'"
 
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4425 ../clients/cli/settings.c:4738
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "プロパティーにはルート '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4438
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6158,17 +6104,18 @@ msgstr ""
 "\n"
 "prefix が指定されない場合、プレフィックスは 32 と見なされます。\n"
 "next-hop が指定されない場合は、0.0.0.0 と見なされます。\n"
-"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォルト値を設定します)。\n"
+"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォ"
+"ルト値を設定します)。\n"
 "\n"
 "例: 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:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4484 ../clients/cli/settings.c:4503
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4521
 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 "
@@ -6179,14 +6126,15 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"DNS サーバーの IPv6 アドレス一覧を入力します。IPv6 設定方法が 'auto' の場合は、自動設定で返されるアドレスに "
-"DNSサーバーが追加されます。 'shared' または 'link-local' の IPv6  設定方法では DNS "
-"サーバーは使用できません。アップストリームのネットワークがないためです。他の IPv6 設定方法ではすべて DNS サーバーはこの接続用の DNS "
-"サーバーとしてのみ使用されます。\n"
+"DNS サーバーの IPv6 アドレス一覧を入力します。IPv6 設定方法が 'auto' の場合"
+"は、自動設定で返されるアドレスに DNSサーバーが追加されます。 'shared' または "
+"'link-local' の IPv6  設定方法では DNS サーバーは使用できません。アップスト"
+"リームのネットワークがないためです。他の IPv6 設定方法ではすべて DNS サーバー"
+"はこの接続用の DNS サーバーとしてのみ使用されます。\n"
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4667
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6200,7 +6148,7 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4751
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6218,34 +6166,35 @@ msgstr ""
 "\n"
 "prefix が指定されない場合、プレフィックスは 128 と見なされます。\n"
 "next-hop が指定されない場合は、\"::\" と見なされます。\n"
-"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォルト値を設定します)。\n"
+"metric が指定されない場合は、デフォルト値と見なされます (NM/カーネルはデフォ"
+"ルト値を設定します)。\n"
 "\n"
-"例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef:"
-":3 2\n"
+"例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
+"beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4768 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4775
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
 
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4822
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
 
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4859
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' は無効です; [e, o, n] を使用してください"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4887
 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 "
@@ -6255,75 +6204,75 @@ msgid ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 msgstr ""
-"nmcli ではダイレクトの JSON "
-"設定データ、設定を含むファイル名のいずれも受け取ることができます。設定を含むファイル名の場合、そのファイルが読み込まれてコンテンツがこのプロパティに置かれます。\n"
+"nmcli ではダイレクトの JSON 設定データ、設定を含むファイル名のいずれも受け取"
+"ることができます。設定を含むファイル名の場合、そのファイルが読み込まれてコン"
+"テンツがこのプロパティに置かれます。\n"
 "\n"
 "例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4927
 msgid "no priority to remove"
 msgstr "削除する優先度がありません"
 
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4931
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4970
 #, c-format
 msgid ""
-"Warning: only one mapping at a time is supported; taking the first one "
-"(%s)\n"
-msgstr "警告: マッピングは一度に 1 つだけ行えます。最初のマッピング (%s) を行います\n"
+"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+msgstr ""
+"警告: マッピングは一度に 1 つだけ行えます。最初のマッピング (%s) を行います\n"
 
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4977
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "プロパティーにはマッピング '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:5025
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "'%s' を空白にすることはできません"
 
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
-#: ../libnm-core/nm-setting-wired.c:651
-#: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832
-#: ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:5100 ../clients/cli/settings.c:5267
+#: ../libnm-core/nm-setting-wired.c:662 ../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
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' は有効な MAC アドレスではありません"
 
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:5106 ../clients/cli/settings.c:5273
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "プロパティーには MAC アドレス '%s' が含まれません"
 
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:5125
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' は無効です; 2  文字または 3 文字の文字列を入力してください"
 
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:5139
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-msgstr "サブチャネルの一覧を入力します (カンマまたはスペースで区切ります)。\n"
+msgstr ""
+"サブチャネルの一覧を入力します (カンマまたはスペースで区切ります)。\n"
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:5161
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "'%s' 文字列値は 1〜199 の文字で構成される必要があります"
 
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:5193
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6334,254 +6283,217 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:5239
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:5245
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5339
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "無効なオプション '%s' です。'default'、'never'、または 'always' を使用してください"
+msgstr ""
+"無効なオプション '%s' です。'default'、'never'、または 'always' を使用してく"
+"ださい"
 
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5400 ../clients/cli/settings.c:5439
+#: ../clients/cli/settings.c:5478
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "プロパティーにはプロトコル '%s' が含まれません"
 
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5517
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設定してください。"
+msgstr ""
+"'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
+"定してください。"
 
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5525
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP キーは '%s' であると仮定しています\n"
 
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5527
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "WEP キーインデックスは '%d' に設定されます\n"
 
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5550
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' は [0 (unknown), 1 (key), 2 (passphrase)] にはありません"
 
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5566 ../clients/cli/settings.c:5569
+#: ../clients/cli/settings.c:5572 ../clients/cli/settings.c:5575
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
-msgstr "警告: '%s' と '%s' タイプは互換性がありません。キーを変更するか、キーを削除してください。\n"
+msgstr ""
+"警告: '%s' と '%s' タイプは互換性がありません。キーを変更するか、キーを削除し"
+"てください。\n"
 
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5588
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr ""
-"WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または key、2 または passphrase です。\n"
+"WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
+"key、2 または passphrase です。\n"
 
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5601
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5645
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' は有効な DCB フラグではありません"
 
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5668
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' は DCB アプリケーションの優先度ではありません"
 
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5694
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマで区切った 8 つの番号を含ませてください"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5711
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
 
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5714
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
 
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5736
 #, c-format
-msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
-msgstr "警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
+msgstr ""
+"警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
 "\n"
 
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5789
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5875 ../clients/cli/settings.c:5881
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr "SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があります"
+msgstr ""
+"SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があり"
+"ます"
 
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5924
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "無効なオプション '%s' です。'%s' または '%s' を使用してください"
 
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:8049
 msgid "don't know how to get the property value"
 msgstr "プロパティ値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:8102 ../clients/cli/settings.c:8142
 msgid "the property can't be changed"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:7821
-msgid "(not available)"
-msgstr "(利用不可)"
-
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:8247
 msgid "[NM property description]"
 msgstr "[NM プロパティの詳細]"
 
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:8252
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
-msgid "<hidden>"
-msgstr "<hidden>"
-
-#: ../clients/cli/utils.c:124
-#, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "エラー: '%s' 引数の値が必要です。"
-
-#: ../clients/cli/utils.c:149
+#: ../clients/cli/utils.c:147
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
+msgstr ""
+"エラー: 引数 '%s' の入力が期待されていましたが、'%s' が入力されました。"
 
-#: ../clients/cli/utils.c:152
+#: ../clients/cli/utils.c:150
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "IP4 アドレス 0x%X をテキスト形式に変換中にエラーが発生しました"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "IP6 アドレス '%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:546 ../clients/cli/utils.c:577
+#.
+#: ../clients/cli/utils.c:490 ../clients/cli/utils.c:521
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' が不明瞭です (%s)"
 
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:500
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:533
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' は無効です;  [%s]、[%s]、または [%s] を使用してください"
 
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:632
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:644
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
 
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:891
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:894
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:951
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "オプション '--terse' には '--fields' の指定が必要です"
 
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:955
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' ではありません"
-
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"警告: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。警告を回避する場合は --nocheck "
-"を使用します。\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
 msgstr ""
-"エラー: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。--nocheck "
-"を使用すると強制的に実行することはできますが、予測できない結果となります。"
+"オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' では"
+"ありません"
 
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "認証セッションはすでに実行されています。"
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#. 
-#: ../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/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:303
 #: ../clients/common/nm-secret-agent-simple.c:342
-#: ../clients/common/nm-secret-agent-simple.c:492
-#: ../clients/common/nm-secret-agent-simple.c:507
-#: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:101
-#: ../clients/common/nm-vpn-helpers.c:102
-#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
+#: ../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-vpn-helpers.c:119
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:124
+#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6605,116 +6517,159 @@ msgstr "キー"
 msgid "Service"
 msgstr "サービス"
 
-#: ../clients/common/nm-secret-agent-simple.c:448
+#: ../clients/common/nm-secret-agent-simple.c:465
 msgid "Authentication required by wireless network"
 msgstr "ワイヤレスネットワークで必要とされる認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:449
+#: ../clients/common/nm-secret-agent-simple.c:466
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "ワイヤレスネットワーク '%s' へのアクセスにはパスワードまたは暗号キーが必要です。"
+msgstr ""
+"ワイヤレスネットワーク '%s' へのアクセスにはパスワードまたは暗号キーが必要で"
+"す。"
 
-#: ../clients/common/nm-secret-agent-simple.c:457
+#: ../clients/common/nm-secret-agent-simple.c:474
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X の認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:460
-msgid "Network name"
-msgstr "ネットワーク名"
+#: ../clients/common/nm-secret-agent-simple.c:475
+#, fuzzy, c-format
+msgid "Secrets are required to access the wired network '%s'"
+msgstr ""
+"ワイヤレスネットワーク '%s' へのアクセスにはパスワードまたは暗号キーが必要で"
+"す。"
 
-#: ../clients/common/nm-secret-agent-simple.c:469
+#: ../clients/common/nm-secret-agent-simple.c:480
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:477
+#: ../clients/common/nm-secret-agent-simple.c:481
+#, fuzzy, c-format
+msgid "Secrets are required for the DSL connection '%s'"
+msgstr "タイプ '%s' の接続には設定が必要です"
+
+#: ../clients/common/nm-secret-agent-simple.c:489
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:478
+#: ../clients/common/nm-secret-agent-simple.c:490
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドのデバイスには PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:480
+#: ../clients/common/nm-secret-agent-simple.c:492
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:488
-#: ../clients/common/nm-secret-agent-simple.c:503
-#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:500
+#: ../clients/common/nm-secret-agent-simple.c:515
+#: ../clients/common/nm-secret-agent-simple.c:533
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドのネットワークパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:489
-#: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:522
-#: ../clients/common/nm-secret-agent-simple.c:542
+#: ../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
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
-#: ../clients/common/nm-secret-agent-simple.c:537
+#: ../clients/common/nm-secret-agent-simple.c:549
 msgid "VPN password required"
 msgstr "PIN パスワードが必要です"
 
-#: ../clients/common/nm-vpn-helpers.c:61
-msgid "could not get VPN plugin info"
-msgstr "VPN プラグイン情報を取得できませんでした"
+#: ../clients/common/nm-vpn-helpers.c:48
+#, fuzzy, c-format
+msgid "unknown VPN plugin \"%s\""
+msgstr "プラグイン %s をロードできません"
+
+#: ../clients/common/nm-vpn-helpers.c:59
+#, fuzzy, c-format
+msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
+msgstr "プラグイン %s をロードできません"
+
+#: ../clients/common/nm-vpn-helpers.c:64
+#, fuzzy, c-format
+msgid ""
+"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
+msgstr "'%s' で VPN プラグインをロードできません: 不明なプラグイン名"
+
+#: ../clients/common/nm-vpn-helpers.c:69
+#, fuzzy, c-format
+msgid "failed to load VPN plugin \"%s\": %s"
+msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
+
+#: ../clients/common/nm-vpn-helpers.c:121
+#, fuzzy
+msgid "Certificate password"
+msgstr "プライベートキーのパスワード"
+
+#: ../clients/common/nm-vpn-helpers.c:122
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "グループパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:103
-#: ../clients/common/nm-vpn-helpers.c:106
+#: ../clients/common/nm-vpn-helpers.c:125
+#: ../clients/common/nm-vpn-helpers.c:128
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../clients/common/nm-vpn-helpers.c:109
+#: ../clients/common/nm-vpn-helpers.c:131
 msgid "Cookie"
 msgstr "クッキー"
 
-#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:132
 msgid "Gateway certificate hash"
 msgstr "ゲートウェイ証明書ハッシュ"
 
-#: ../clients/nm-online.c:94
+#: ../clients/nm-online.c:114
 msgid "Connecting"
 msgstr "接続中"
 
-#: ../clients/nm-online.c:147
+#: ../clients/nm-online.c:181
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は 30)"
+msgstr ""
+"接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は "
+"30)"
 
-#: ../clients/nm-online.c:148
+#: ../clients/nm-online.c:182
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
 
-#: ../clients/nm-online.c:149
+#: ../clients/nm-online.c:183
 msgid "Don't print anything"
 msgstr "出力を抑制する"
 
-#: ../clients/nm-online.c:150
+#: ../clients/nm-online.c:184
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "接続の代わりに NetworkManager の起動を待機します"
 
-#: ../clients/nm-online.c:171
+#: ../clients/nm-online.c:204
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
-msgstr "NetworkManager によりスタートアップネットワーク接続のアクティベートが完了されるのを待機します。"
+msgstr ""
+"NetworkManager によりスタートアップネットワーク接続のアクティベートが完了され"
+"るのを待機します。"
 
-#: ../clients/nm-online.c:178 ../clients/nm-online.c:184
+#: ../clients/nm-online.c:211 ../clients/nm-online.c:217
 msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。"
+msgstr ""
+"無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
+"い。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:418
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:114
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "OK"
 
@@ -6744,23 +6699,38 @@ 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
+msgid "Ethernet"
+msgstr "Ethernet"
+
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "イーサネット接続 %d"
 
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
+#: ../libnm/nm-device.c:1663
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 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
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
+#: ../libnm/nm-device.c:1671
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -6778,9 +6748,10 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
-#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
+#: ../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
 msgid "Bond"
 msgstr "ボンド"
 
@@ -6789,9 +6760,10 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
-#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
+#: ../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
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -6800,9 +6772,10 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
-#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
+#: ../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
 msgid "Team"
 msgstr "team "
 
@@ -6816,7 +6789,17 @@ msgstr "team 接続 %d"
 msgid "VLAN connection %d"
 msgstr "VLAN 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:236
+#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
+#, fuzzy
+msgid "IP tunnel"
+msgstr "IP トンネル"
+
+#: ../clients/tui/nm-editor-utils.c:229
+#, fuzzy, c-format
+msgid "IP tunnel connection %d"
+msgstr "IP トンネル接続"
+
+#: ../clients/tui/nm-editor-utils.c:244
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 接続 %d"
@@ -6836,7 +6819,7 @@ msgid "Edit..."
 msgstr "編集..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:526
+#: ../clients/tui/nmtui-edit.c:531
 msgid "Delete"
 msgstr "削除"
 
@@ -6848,54 +6831,55 @@ msgstr "隠す"
 msgid "Show"
 msgstr "表示する"
 
-#: ../clients/tui/nmt-editor.c:97
+#: ../clients/tui/nmt-editor.c:98
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
 msgstr "接続 '%s'、タイプ '%s' 用のエディタを作成できませんでした。"
 
-#: ../clients/tui/nmt-editor.c:101
+#: ../clients/tui/nmt-editor.c:102
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
 msgstr "無効な接続 '%s' のエディタを作成できませんでした。"
 
-#: ../clients/tui/nmt-editor.c:111
+#: ../clients/tui/nmt-editor.c:112
+#, fuzzy
 msgid "Edit Connection"
 msgstr "接続の編集"
 
-#: ../clients/tui/nmt-editor.c:164
+#: ../clients/tui/nmt-editor.c:165
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "接続を保存できません: %s"
 
-#: ../clients/tui/nmt-editor.c:178
+#: ../clients/tui/nmt-editor.c:179
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "新しい接続を追加できません: %s"
 
-#: ../clients/tui/nmt-editor.c:320
+#: ../clients/tui/nmt-editor.c:321
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: ../clients/tui/nmt-editor.c:331
+#: ../clients/tui/nmt-editor.c:332
 msgid "Ethernet device"
 msgstr "Ethernet デバイス"
 
-#: ../clients/tui/nmt-editor.c:333
+#: ../clients/tui/nmt-editor.c:334
 msgid "Device"
 msgstr "デバイス"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:391
+#: ../clients/tui/nmt-editor.c:394
 msgid "Automatically connect"
 msgstr "自動的に接続する"
 
-#: ../clients/tui/nmt-editor.c:397
+#: ../clients/tui/nmt-editor.c:400
 msgid "Available to all users"
 msgstr "全ユーザーに使用可能"
 
-#: ../clients/tui/nmt-editor.c:412 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:217
-#: ../clients/tui/nmtui-edit.c:525 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:415 ../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"
 msgstr "取り消し"
 
@@ -6944,7 +6928,8 @@ msgstr "ARP"
 msgid "Slaves"
 msgstr "スレーブ"
 
-#: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-wifi.c:230
+#: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-ip-tunnel.c:148
+#: ../clients/tui/nmt-page-wifi.c:230
 msgid "Mode"
 msgstr "モード"
 
@@ -7045,10 +7030,6 @@ msgstr "接続されました"
 msgid "INFINIBAND"
 msgstr "インフィニバンド"
 
-#: ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "トランスポートモード"
-
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "無効"
@@ -7127,6 +7108,64 @@ msgstr "IPv6 設定"
 msgid "Require IPv6 addressing for this connection"
 msgstr "この接続には IPv6 アドレス設定が必要になります"
 
+#. The order must match the NM_IP_TUNNEL_MODE_* enum
+#: ../clients/tui/nmt-page-ip-tunnel.c:78
+msgid "IPIP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:79
+msgid "GRE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:80
+msgid "SIT"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:81
+msgid "ISATAP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:82
+msgid "VTI"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:83
+msgid "IP6IP6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:84
+msgid "IPIP6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:85
+msgid "IP6GRE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:86
+msgid "VTI6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:99
+msgid "Parent"
+msgstr "親"
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:157
+msgid "Local IP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:163
+#, fuzzy
+msgid "Remote IP"
+msgstr "リモート: "
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:169
+msgid "Input key"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:176
+msgid "Output key"
+msgstr ""
+
 #: ../clients/tui/nmt-page-ppp.c:131
 msgid "PPP CONFIGURATION"
 msgstr "PPP 設定"
@@ -7191,10 +7230,6 @@ msgstr "team ポート"
 msgid "JSON configuration"
 msgstr "JSON 設定"
 
-#: ../clients/tui/nmt-page-vlan.c:99
-msgid "Parent"
-msgstr "親"
-
 #: ../clients/tui/nmt-page-vlan.c:114
 msgid "VLAN id"
 msgstr "VLAN id"
@@ -7360,7 +7395,8 @@ msgstr "削除"
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
-msgstr "認証するために openconnect が実行されます。\n"
+msgstr ""
+"認証するために openconnect が実行されます。\n"
 "処理が完了すると、nmtui に戻ります。"
 
 #: ../clients/tui/nmtui-connect.c:68
@@ -7386,62 +7422,68 @@ msgstr "アクティベーションに失敗しました"
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299
+#: ../clients/tui/nmtui-connect.c:271 ../clients/tui/nmtui-connect.c:302
 #, c-format
 msgid "Could not activate connection: %s"
 msgstr "接続をアクティベートできませんでした: %s"
 
-#: ../clients/tui/nmtui-connect.c:359 ../clients/tui/nmtui-connect.c:408
+#: ../clients/tui/nmtui-connect.c:362 ../clients/tui/nmtui-connect.c:411
 msgid "Activate"
 msgstr "アクティベート"
 
-#: ../clients/tui/nmtui-connect.c:361
+#: ../clients/tui/nmtui-connect.c:364
 msgid "Deactivate"
 msgstr "解除"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:108
+#: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "終了"
 
-#: ../clients/tui/nmtui-connect.c:436
+#: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
+msgid "Back"
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:439
 #, c-format
 msgid "No such connection '%s'"
 msgstr "そのような接続 '%s' はありません"
 
-#: ../clients/tui/nmtui-connect.c:438
+#: ../clients/tui/nmtui-connect.c:441
 msgid "Connection is already active"
 msgstr "接続はすでにアクティブになっています"
 
-#: ../clients/tui/nmtui-edit.c:225
+#: ../clients/tui/nmtui-edit.c:230
 msgid "Create"
 msgstr "作成"
 
-#: ../clients/tui/nmtui-edit.c:367
+#: ../clients/tui/nmtui-edit.c:372
 msgid "Select the type of connection you wish to create."
 msgstr "作成したい接続タイプを選択してください。"
 
-#: ../clients/tui/nmtui-edit.c:375
+#: ../clients/tui/nmtui-edit.c:380
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr "VPN の作成中、作成したい VPN 接続が一覧に表示されない場合、適切な VPN プラグインがインストールされていない可能性があります。"
+msgstr ""
+"VPN の作成中、作成したい VPN 接続が一覧に表示されない場合、適切な VPN プラグ"
+"インがインストールされていない可能性があります。"
 
-#: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
+#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
 msgid "New Connection"
 msgstr "新規の接続"
 
-#: ../clients/tui/nmtui-edit.c:466
+#: ../clients/tui/nmtui-edit.c:471
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "接続を削除できません: %s"
 
-#: ../clients/tui/nmtui-edit.c:505
+#: ../clients/tui/nmtui-edit.c:510
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "接続 '%s' を削除できませんでした: %s"
 
-#: ../clients/tui/nmtui-edit.c:527
+#: ../clients/tui/nmtui-edit.c:532
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "本当に接続 '%s' を削除してもいいですか?"
@@ -7485,28 +7527,28 @@ msgstr "新規のホスト名"
 msgid "Set system hostname"
 msgstr "システムのホスト名を設定する"
 
-#: ../clients/tui/nmtui.c:83
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:91
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
 msgstr "オプションを選択してください"
 
-#: ../clients/tui/nmtui.c:143
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
 msgstr "使い方"
 
-#: ../clients/tui/nmtui.c:224
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "引数を解析できませんでした"
 
-#: ../clients/tui/nmtui.c:234
+#: ../clients/tui/nmtui.c:251
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "NetworkManager に接続できませんでした: %s.\n"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
 msgstr "NetworkManager が実行していません。"
 
@@ -7792,72 +7834,70 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:224
+#: ../libnm-core/nm-connection.c:225
 msgid "wrong type; should be a list of strings."
 msgstr "正しくないタイプ; 文字列のリストである必要があります。"
 
-#: ../libnm-core/nm-connection.c:294
+#: ../libnm-core/nm-connection.c:295
 msgid "unknown setting name"
 msgstr "不明な設定名"
 
-#: ../libnm-core/nm-connection.c:306
+#: ../libnm-core/nm-connection.c:307
 msgid "duplicate setting name"
 msgstr "重複する設定名"
 
-#: ../libnm-core/nm-connection.c:873
+#: ../libnm-core/nm-connection.c:1044
 msgid "setting not found"
 msgstr "設定が見つかりません"
 
-#: ../libnm-core/nm-connection.c:937
+#: ../libnm-core/nm-connection.c:1110
 msgid "setting not allowed in slave connection"
 msgstr "設定がスレーブ接続で許可されません"
 
-#: ../libnm-core/nm-connection.c:948
+#: ../libnm-core/nm-connection.c:1126
 msgid "setting is required for non-slave connections"
 msgstr "設定は非スレーブ接続で必要です"
 
-#: ../libnm-core/nm-connection.c:1042
+#: ../libnm-core/nm-connection.c:1221
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確認するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1075
+#: ../libnm-core/nm-connection.c:1258
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正規化するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
-#: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
-#: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
-#: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
-#: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
-#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
+#: ../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-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138
-#: ../libnm-core/nm-setting-cdma.c:141
-#: ../libnm-core/nm-setting-connection.c:837
-#: ../libnm-core/nm-setting-connection.c:876
-#: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2167
+#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../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-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
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
 #: ../libnm-core/nm-setting-wireless-security.c:861
-#: ../libnm-core/nm-setting-wireless.c:729 ../libnm-util/nm-setting.c:1357
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
 #: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
 #: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
 #: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
 #: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
 #: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
 #: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
-#: ../libnm-util/nm-setting-adsl.c:209
-#: ../libnm-util/nm-setting-bluetooth.c:142
-#: ../libnm-util/nm-setting-bluetooth.c:160
-#: ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
 #: ../libnm-util/nm-setting-connection.c:768
 #: ../libnm-util/nm-setting-connection.c:784
 #: ../libnm-util/nm-setting-connection.c:845
 #: ../libnm-util/nm-setting-ip4-config.c:869
 #: ../libnm-util/nm-setting-ip6-config.c:833
-#: ../libnm-util/nm-setting-ip6-config.c:896
+#: ../libnm-util/nm-setting-ip6-config.c:899
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
 #: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
 #: ../libnm-util/nm-setting-wimax.c:150
@@ -7866,165 +7906,173 @@ msgstr "接続を正規化するときの予期しない障害"
 msgid "property is missing"
 msgstr "プロパティがありません"
 
+#: ../libnm-core/nm-connection.c:1902
+msgid "IP Tunnel"
+msgstr "IP トンネル"
+
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
 
-#: ../libnm-core/nm-keyfile-reader.c:136
+#: ../libnm-core/nm-keyfile-reader.c:142
 msgid "ignoring missing number"
 msgstr "不明な数字を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:145
+#: ../libnm-core/nm-keyfile-reader.c:151
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効な数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:165
+#: ../libnm-core/nm-keyfile-reader.c:171
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効な %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:205
+#: ../libnm-core/nm-keyfile-reader.c:211
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:225
+#: ../libnm-core/nm-keyfile-reader.c:231
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効な %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:343
+#: ../libnm-core/nm-keyfile-reader.c:349
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:353
+#: ../libnm-core/nm-keyfile-reader.c:359
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:362
+#: ../libnm-core/nm-keyfile-reader.c:368
 #, 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:373
+#: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s の後のガーベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:379
+#: ../libnm-core/nm-keyfile-reader.c:385
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s の後の非推奨のセミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:394
+#: ../libnm-core/nm-keyfile-reader.c:400
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:401
+#: ../libnm-core/nm-keyfile-reader.c:407
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:504
+#: ../libnm-core/nm-keyfile-reader.c:510
 #, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
 msgstr "無効な DNS サーバー IPv4 アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:543
+#: ../libnm-core/nm-keyfile-reader.c:549
 #, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
 msgstr "無効な DNS サーバー IPv6 アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
-#: ../libnm-core/nm-keyfile-reader.c:1446
+#: ../libnm-core/nm-keyfile-reader.c:644 ../libnm-core/nm-keyfile-reader.c:1540
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:642
+#: ../libnm-core/nm-keyfile-reader.c:655
 msgid "ignoring invalid MAC address"
 msgstr "有効な MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:758
-msgid "ignoring invalid binary property"
-msgstr "無効なバイナリープロパティーを無視"
-
-#: ../libnm-core/nm-keyfile-reader.c:801
+#: ../libnm-core/nm-keyfile-reader.c:864
 msgid "ignoring invalid SSID"
 msgstr "無効な SSID を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:817
+#: ../libnm-core/nm-keyfile-reader.c:880
 msgid "ignoring invalid raw password"
 msgstr "無効な生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:892
-#: ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:955 ../libnm-core/nm-keyfile-reader.c:1131
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "証明書またはキーファイル '%s' が存在しません"
 
-#: ../libnm-core/nm-keyfile-reader.c:897
+#: ../libnm-core/nm-keyfile-reader.c:960
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効なキー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile-reader.c:935
+#: ../libnm-core/nm-keyfile-reader.c:970
+#, c-format
+msgid "invalid PKCS#11 URI \"%s\""
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1008
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
 
-#: ../libnm-core/nm-keyfile-reader.c:948
+#: ../libnm-core/nm-keyfile-reader.c:1021
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効なキー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile-reader.c:1095
+#: ../libnm-core/nm-keyfile-reader.c:1168
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効なキー/証明書値は有効なブロブではありません"
 
-#: ../libnm-core/nm-keyfile-reader.c:1100
+#: ../libnm-core/nm-keyfile-reader.c:1173
 msgid "invalid key/cert value"
 msgstr "無効なキー/証明書値"
 
-#: ../libnm-core/nm-keyfile-reader.c:1147
+#: ../libnm-core/nm-keyfile-reader.c:1220
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効なパリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:1347
+#: ../libnm-core/nm-keyfile-reader.c:1238
+#, fuzzy, c-format
+msgid "ignoring invalid team configuration: %s"
+msgstr "無効な %s ルートを無視: %s"
+
+#: ../libnm-core/nm-keyfile-reader.c:1441
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "設定値のロード中にエラーが発生しました: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1379
+#: ../libnm-core/nm-keyfile-reader.c:1473
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "無効な負の値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1400
+#: ../libnm-core/nm-keyfile-reader.c:1494
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "無効な char 値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1423
+#: ../libnm-core/nm-keyfile-reader.c:1517
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "無効な int64 値 (%s)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1482
+#: ../libnm-core/nm-keyfile-reader.c:1576
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
 msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1495
+#: ../libnm-core/nm-keyfile-reader.c:1589
 #, c-format
 msgid "unhandled setting property type '%s'"
 msgstr "プロパティータイプ '%s' の設定が未処理"
 
-#: ../libnm-core/nm-keyfile-reader.c:1526
+#: ../libnm-core/nm-keyfile-reader.c:1620
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効な設定名 '%s'"
@@ -8033,51 +8081,53 @@ msgstr "無効な設定名 '%s'"
 msgid "data missing"
 msgstr "データがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:448
+#: ../libnm-core/nm-setting-8021x.c:450
 msgid "binary data missing"
 msgstr "バイナリーデータがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:465
-msgid "file:// URI not NUL terminated"
+#: ../libnm-core/nm-setting-8021x.c:478
+#, fuzzy
+msgid "URI not NUL terminated"
 msgstr "file:// URI が NUL で終了していません"
 
-#: ../libnm-core/nm-setting-8021x.c:474
-msgid "file:// URI is empty"
+#: ../libnm-core/nm-setting-8021x.c:487
+#, fuzzy
+msgid "URI is empty"
 msgstr "file:// URI が空です"
 
-#: ../libnm-core/nm-setting-8021x.c:482
-msgid "file:// URI is not valid UTF-8"
+#: ../libnm-core/nm-setting-8021x.c:495
+#, fuzzy
+msgid "URI is not valid UTF-8"
 msgstr "file:// URI が有効な UTF-8 ではありません"
 
-#: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:731 ../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:1012 ../libnm-core/nm-setting-8021x.c:1276
-#: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
+#: ../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-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
 msgid "invalid certificate format"
 msgstr "無効な証明書形式"
 
-#: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2098 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "無効なプライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2445 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
 msgstr "無効な phase2 プライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
-#: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
-#: ../libnm-core/nm-setting-8021x.c:2524 ../libnm-core/nm-setting-8021x.c:2536
-#: ../libnm-core/nm-setting-8021x.c:2554 ../libnm-core/nm-setting-8021x.c:2566
-#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
+#: ../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-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887
-#: ../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:2174
+#: ../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-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
@@ -8093,9 +8143,8 @@ msgstr "無効な phase2 プライベートキー"
 #: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
 #: ../libnm-util/nm-setting-cdma.c:178
 #: ../libnm-util/nm-setting-connection.c:775
-#: ../libnm-util/nm-setting-connection.c:852
-#: ../libnm-util/nm-setting-gsm.c:282 ../libnm-util/nm-setting-gsm.c:339
-#: ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
 #: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
 #: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -8105,28 +8154,28 @@ msgstr "無効な phase2 プライベートキー"
 msgid "property is empty"
 msgstr "プロパティが空です"
 
-#: ../libnm-core/nm-setting-8021x.c:2448 ../libnm-core/nm-setting-8021x.c:2496
+#: ../libnm-core/nm-setting-8021x.c:2691 ../libnm-core/nm-setting-8021x.c:2739
 #: ../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:2723
+#: ../libnm-core/nm-setting-8021x.c:2966
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "証明書が無効です: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:2758
+#: ../libnm-core/nm-setting-8021x.c:3001
 #: ../libnm-core/nm-setting-bluetooth.c:129
 #: ../libnm-core/nm-setting-infiniband.c:192
 #: ../libnm-core/nm-setting-infiniband.c:207
 #: ../libnm-core/nm-setting-ip4-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../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:665
-#: ../libnm-core/nm-setting-wired.c:675
+#: ../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-wireless-security.c:934
 #: ../libnm-core/nm-setting-wireless-security.c:943
 #: ../libnm-core/nm-setting-wireless-security.c:952
@@ -8134,16 +8183,16 @@ msgstr "証明書が無効です: %s"
 #: ../libnm-core/nm-setting-wireless-security.c:998
 #: ../libnm-core/nm-setting-wireless-security.c:1029
 #: ../libnm-core/nm-setting-wireless-security.c:1068
-#: ../libnm-core/nm-setting-wireless.c:790
-#: ../libnm-core/nm-setting-wireless.c:799
-#: ../libnm-core/nm-setting-wireless.c:808 ../libnm-util/nm-setting.c:1367
+#: ../libnm-core/nm-setting-wireless.c:811
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
 #: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
 #: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
 #: ../libnm-util/nm-setting-bluetooth.c:151
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:887
+#: ../libnm-util/nm-setting-ip6-config.c:890
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
 #: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
 #: ../libnm-util/nm-setting-wired.c:667
@@ -8158,17 +8207,15 @@ msgstr "証明書が無効です: %s"
 msgid "property is invalid"
 msgstr "プロパティが無効です"
 
-#: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
-#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
-#: ../libnm-core/nm-setting-8021x.c:2823 ../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-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-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
 #: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
 #: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240
-#: ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
 #: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
@@ -8179,75 +8226,76 @@ msgstr "'%s' は有効なプロパティの値ではありません"
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
+#: ../libnm-core/nm-setting-bond.c:550 ../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:510 ../libnm-util/nm-setting-bond.c:521
+#: ../libnm-core/nm-setting-bond.c:575 ../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:523 ../libnm-util/nm-setting-bond.c:532
+#: ../libnm-core/nm-setting-bond.c:588 ../libnm-util/nm-setting-bond.c:532
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "必須オプションの '%s' がありません"
 
-#: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:598 ../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:547 ../libnm-util/nm-setting-bond.c:554
+#: ../libnm-core/nm-setting-bond.c:612 ../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:560 ../libnm-util/nm-setting-bond.c:567
-#, c-format
-msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "'%s' は '%s' オプションの有効なインターフェース名ではありません"
+#: ../libnm-core/nm-setting-bond.c:627
+#, fuzzy, c-format
+msgid "'%s' is not a valid for '%s' option: %s"
+msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-setting-bond.c:570 ../libnm-util/nm-setting-bond.c:577
+#: ../libnm-core/nm-setting-bond.c:638 ../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:583 ../libnm-util/nm-setting-bond.c:590
+#: ../libnm-core/nm-setting-bond.c:651 ../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:596 ../libnm-core/nm-setting-bond.c:605
-#: ../libnm-core/nm-setting-bond.c:625 ../libnm-core/nm-setting-bond.c:661
+#: ../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-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
 msgid "'%s' option requires '%s' option to be set"
-msgstr "'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
+msgstr ""
+"'%s' オプションを使用する場合は '%s' オプションを設定する必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:704 ../libnm-util/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' option is empty"
 msgstr "'%s' オプションが空白です"
 
-#: ../libnm-core/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:655
+#: ../libnm-core/nm-setting-bond.c:716 ../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:676 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:744 ../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:687
+#: ../libnm-core/nm-setting-bond.c:755
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "'%s' と '%s' の値は同じである必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:703
+#: ../libnm-core/nm-setting-bond.c:771
 #, c-format
 msgid "'%s' option should be string"
 msgstr "'%s' オプションは文字列である必要があります"
@@ -8261,80 +8309,84 @@ 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-team-port.c:97
+#: ../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-team-port.c:108
+#: ../libnm-core/nm-setting-team-port.c:110
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr "'%s' 設定の接続ではスレーブタイプは '%s' に設定する必要がありますが、'%s' に設定されています。"
+msgstr ""
+"'%s' 設定の接続ではスレーブタイプは '%s' に設定する必要がありますが、'%s' に"
+"設定されています。"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 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:639
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-core/nm-setting-wired.c:727
+#: ../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-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"
 msgstr "は有効な MAC アドレスではありません"
 
-#: ../libnm-core/nm-setting-connection.c:816
+#: ../libnm-core/nm-setting-connection.c:850
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "タイプ '%s' の接続には設定が必要です"
 
-#: ../libnm-core/nm-setting-connection.c:897
+#: ../libnm-core/nm-setting-connection.c:933
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "接続タイプ '%s' は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:932
+#: ../libnm-core/nm-setting-connection.c:968
 #: ../libnm-util/nm-setting-connection.c:877
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "不明なスレーブタイプ '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:942
+#: ../libnm-core/nm-setting-connection.c:978
 #: ../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:963
+#: ../libnm-core/nm-setting-connection.c:999
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "'%s' を '%s' なしで設定できません"
 
-#: ../libnm-core/nm-setting-connection.c:977
+#: ../libnm-core/nm-setting-connection.c:1013
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "測定値 %d は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:998
+#: ../libnm-core/nm-setting-connection.c:1034
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "プロパティータイプは '%s' に設定する必要があります"
 
-#: ../libnm-core/nm-setting-connection.c:1013
+#: ../libnm-core/nm-setting-connection.c:1049
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-connection.c:1023
+#: ../libnm-core/nm-setting-connection.c:1059
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は '%s' に設定する必要があります"
+msgstr ""
+"'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
+"'%s' に設定する必要があります"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
@@ -8389,33 +8441,32 @@ msgstr "プロパティーが空、または間違ったサイズです"
 msgid "property must contain only digits"
 msgstr "プロパティーには数字のみ含めることができます"
 
-#: ../libnm-core/nm-setting-infiniband.c:217
-#: ../libnm-util/nm-setting-infiniband.c:231
-msgid "not a valid interface name"
-msgstr "無効なインターフェース名です"
-
-#: ../libnm-core/nm-setting-infiniband.c:225
+#: ../libnm-core/nm-setting-infiniband.c:228
 #: ../libnm-util/nm-setting-infiniband.c:239
 msgid "Must specify a P_Key if specifying parent"
 msgstr "親を指定している場合は P_Key を指定する必要があります"
 
-#: ../libnm-core/nm-setting-infiniband.c:235
+#: ../libnm-core/nm-setting-infiniband.c:238
 #: ../libnm-util/nm-setting-infiniband.c:249
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
 
-#: ../libnm-core/nm-setting-infiniband.c:271
+#: ../libnm-core/nm-setting-infiniband.c:275
 #: ../libnm-util/nm-setting-infiniband.c:285
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr "ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定である必要があります (実際には '%s')"
+msgstr ""
+"ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定"
+"である必要があります (実際には '%s')"
 
-#: ../libnm-core/nm-setting-infiniband.c:286
+#: ../libnm-core/nm-setting-infiniband.c:290
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr "トランスポートモード '%s' の mtu は最大で %d にすることができますが実際には %d です"
+msgstr ""
+"トランスポートモード '%s' の mtu は最大で %d にすることができますが実際には "
+"%d です"
 
 #: ../libnm-core/nm-setting-ip-config.c:133
 #, c-format
@@ -8428,12 +8479,12 @@ msgid "Missing IPv6 address"
 msgstr "不明な IPv6 アドレス"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
@@ -8452,46 +8503,51 @@ msgstr "無効な IPv6 アドレスプレフィックス '%u'"
 msgid "Invalid routing metric '%s'"
 msgstr "無効なルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2187
+#: ../libnm-core/nm-setting-ip-config.c:2278
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS サーバーアドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2203
+#: ../libnm-core/nm-setting-ip-config.c:2294
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2215
+#: ../libnm-core/nm-setting-ip-config.c:2306
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP アドレスには無効なタイプの 'label' プロパティーがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2224
+#: ../libnm-core/nm-setting-ip-config.c:2315
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP アドレスには無効なラベル '%s' があります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2238
+#: ../libnm-core/nm-setting-ip-config.c:2329
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2247
+#: ../libnm-core/nm-setting-ip-config.c:2338
 msgid "gateway is invalid"
 msgstr "ゲートウェイが無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2261
+#: ../libnm-core/nm-setting-ip-config.c:2352
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルートは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2270
+#: ../libnm-core/nm-setting-ip-config.c:2361
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. ルートをデフォルトルートにすることはできません"
 
+#: ../libnm-core/nm-setting-ip-config.c:2372
+#, fuzzy, c-format
+msgid "a gateway is incompatible with '%s'"
+msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
+
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:144
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, c-format
@@ -8501,15 +8557,15 @@ msgstr "'%s=%s' のこのプロパティーを空にすることはできませ
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:156
-#: ../libnm-core/nm-setting-ip6-config.c:166
-#: ../libnm-core/nm-setting-ip6-config.c:176
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
+#: ../libnm-core/nm-setting-ip6-config.c:202
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
 #: ../libnm-util/nm-setting-ip6-config.c:855
 #: ../libnm-util/nm-setting-ip6-config.c:865
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "このプロパティは '%s=%s' には許可されていません"
@@ -8523,39 +8579,67 @@ msgstr "'%s' は有効な FQDN ではありません"
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr "dhcp-hostname も設定されている場合は、プロパティーを設定できません"
 
+#: ../libnm-core/nm-setting-ip4-config.c:235
+#, fuzzy, c-format
+msgid "multiple addresses are not allowed for '%s=%s'"
+msgstr "このプロパティは '%s=%s' には許可されていません"
+
+#: ../libnm-core/nm-setting-ip4-config.c:249
+#, fuzzy
+msgid "property should be TRUE when method is set to disabled"
+msgstr "プロパティータイプは '%s' に設定する必要があります"
+
+#: ../libnm-core/nm-setting-ip6-config.c:241
+#, fuzzy
+msgid "value is not a valid token"
+msgstr "値 '%s' は有効な UUID ではありません"
+
+#: ../libnm-core/nm-setting-ip6-config.c:252
+#, fuzzy
+msgid "only makes sense with EUI64 address generation mode"
+msgstr "IPv6 SLAAC アドレス生成モード"
+
+#: ../libnm-core/nm-setting-ip6-config.c:264
+msgid "token is not in canonical form"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip6-config.c:276
+msgid "property should be TRUE when method is set to ignore"
+msgstr ""
+
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, c-format
 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:647
+#: ../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、インターフェース名のいずれでもありません"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-ip-tunnel.c:361
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "'%s' は有効な IPv%c アドレスではありません"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:366
+#: ../libnm-core/nm-setting-ip-tunnel.c:375
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:379
-#: ../libnm-core/nm-setting-ip-tunnel.c:395
+#: ../libnm-core/nm-setting-ip-tunnel.c:388
+#: ../libnm-core/nm-setting-ip-tunnel.c:404
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "'%s' は有効なトンネルキーではありません"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:407
+#: ../libnm-core/nm-setting-ip-tunnel.c:416
 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:661
+#: ../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'"
@@ -8566,14 +8650,14 @@ msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
-#: ../libnm-core/nm-setting-wireless.c:739
+#: ../libnm-core/nm-setting-wireless.c:760
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
 #: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID の長さは範囲外 <1-32> バイトです"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:139
-#: ../libnm-core/nm-setting-wireless.c:779
+#: ../libnm-core/nm-setting-wireless.c:800
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
 #: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
@@ -8590,6 +8674,36 @@ msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
 msgid "setting this property requires non-zero '%s' property"
 msgstr "このプロパティを設定するにはゼロ以外の '%s' プロパティが必要です"
 
+#: ../libnm-core/nm-setting-proxy.c:163
+#, fuzzy, c-format
+msgid "invalid proxy method"
+msgstr "無効な優先度マップ '%s'"
+
+#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
+#, fuzzy, c-format
+msgid "this property is not allowed for method none"
+msgstr "このプロパティは '%s=%s' には許可されていません"
+
+#: ../libnm-core/nm-setting-proxy.c:193
+#, c-format
+msgid "the script is too large"
+msgstr ""
+
+#: ../libnm-core/nm-setting-proxy.c:201
+#, fuzzy, c-format
+msgid "the script is not valid utf8"
+msgstr "インデックス '%s' は無効です"
+
+#: ../libnm-core/nm-setting-proxy.c:209
+#, c-format
+msgid "the script lacks FindProxyForURL function"
+msgstr ""
+
+#: ../libnm-core/nm-setting-team.c:94 ../libnm-core/nm-setting-team-port.c:122
+#, c-format
+msgid "team config exceeds size limit"
+msgstr ""
+
 #: ../libnm-core/nm-setting-tun.c:187
 #, c-format
 msgid "'%u': invalid mode"
@@ -8605,17 +8719,17 @@ msgstr "'%s': 無効なユーザー ID"
 msgid "'%s': invalid group ID"
 msgstr "'%s': 無効なグループ ID"
 
-#: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
+#: ../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-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "vlan id は 0〜4094 の範囲内である必要がありますが、%u です"
 
-#: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:679 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
 msgstr "フラグが無効です"
 
@@ -8641,15 +8755,11 @@ msgstr "シークレットプロパティーではありません"
 msgid "secret is not of correct type"
 msgstr "シークレットのタイプが正しくありません"
 
-#: ../libnm-core/nm-setting-vpn.c:586
+#: ../libnm-core/nm-setting-vpn.c:582
 #, c-format
 msgid "failed to convert value '%s' to uint"
 msgstr "値 '%s' を uint に変換するのに失敗しました"
 
-#: ../libnm-core/nm-setting-vpn.c:594
-msgid "secret flags property not found"
-msgstr "シークレットフラグプロパティーが見つかりません"
-
 #: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
 msgid "'%s' is not a valid IP address"
@@ -8665,29 +8775,42 @@ msgstr "'%s' は有効な IP%c アドレスではありません"
 msgid "%d is greater than local port max %d"
 msgstr "%d はローカルポートの最大 %d よりも大きいです"
 
-#: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, c-format
+#: ../libnm-core/nm-setting-wired.c:630 ../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:629 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:640 ../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:688 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:699 ../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:709
+#: ../libnm-core/nm-setting-wired.c:736
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグです"
 
-#: ../libnm-core/nm-setting-wired.c:718
+#: ../libnm-core/nm-setting-wired.c:745
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "Wake-on-LAN パスワードはマジックパケットモードでのみ使用できます"
 
+#: ../libnm-core/nm-setting-wired.c:768
+msgid "when link autonegotiation is enabled no duplex value is accepted"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:776
+msgid "when link autonegotiation is enabled speed should be 0"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:786
+#, fuzzy
+msgid "both speed and duplex are required for static link configuration"
+msgstr "VPN サービスは無効な設定を返しました"
+
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
@@ -8718,23 +8841,33 @@ msgstr "'%s' の接続の場合、このプロパティに '%s' が必要にな
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
 
-#: ../libnm-core/nm-setting-wireless.c:748
+#: ../libnm-core/nm-setting-wireless.c:769
 #: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "'%s' は有効な Wi-Fi モードではありません"
 
-#: ../libnm-core/nm-setting-wireless.c:758
+#: ../libnm-core/nm-setting-wireless.c:779
 #: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "'%s' は有効なバンドではありません"
 
-#: ../libnm-core/nm-setting-wireless.c:768
+#: ../libnm-core/nm-setting-wireless.c:789
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "'%s' の場合は '%s' プロパティーを設定する必要があります"
 
+#: ../libnm-core/nm-setting-wireless.c:883
+#, fuzzy, c-format
+msgid "invalid value"
+msgstr "無効なキー/証明書値"
+
+#: ../libnm-core/nm-setting-wireless.c:904
+#, c-format
+msgid "conflicting value of mac-address-randomization and cloned-mac-address"
+msgstr ""
+
 #: ../libnm-core/nm-setting.c:837
 #, c-format
 msgid "duplicate property"
@@ -8768,163 +8901,233 @@ msgstr "シークレットが見つかりません"
 msgid "secret is not set"
 msgstr "シークレットが設定されていません"
 
-#: ../libnm-core/nm-utils.c:2447
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
 
-#: ../libnm-core/nm-utils.c:2456
+#: ../libnm-core/nm-utils.c:2497
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2467
-#, c-format
+#: ../libnm-core/nm-utils.c:2508
+#, fuzzy, c-format
 msgid "invalid file owner %d for %s"
-msgstr "%2$s の無効なファイル所有者 %1$d"
+msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../libnm-core/nm-utils.c:2478
+#: ../libnm-core/nm-utils.c:2519
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s のファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:2488
+#: ../libnm-core/nm-utils.c:2529
 #, c-format
 msgid "reject %s"
 msgstr "%s の拒否"
 
-#: ../libnm-core/nm-utils.c:2508
+#: ../libnm-core/nm-utils.c:2549
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パスが絶対パスではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2522
+#: ../libnm-core/nm-utils.c:2563
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイルが存在しません (%s)"
 
-#: ../libnm-core/nm-utils.c:2530
+#: ../libnm-core/nm-utils.c:2571
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグインが有効なファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:2540
+#: ../libnm-core/nm-utils.c:2581
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブはサポートされていません (%s)"
 
-#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
+#: ../libnm-core/nm-utils.c:2663 ../libnm-util/nm-utils.c:1803
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" バイナリーを見つけることができませんでした"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:124
-#, c-format
-msgid "cannot load plugin %s"
-msgstr "プラグイン %s をロードできません"
+#: ../libnm-core/nm-utils.c:3709
+#, fuzzy, c-format
+msgid "not a valid ethernet MAC address for mask at position %lld"
+msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:150
+#: ../libnm-core/nm-utils.c:3724
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr "'%s' で VPN プラグインをロードできません: 不明なプラグイン名"
+msgid "not a valid ethernet MAC address #%u at position %lld"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3758
+#, fuzzy
+msgid "interface name is too short"
+msgstr "インターフェース名 [*]: "
+
+#: ../libnm-core/nm-utils.c:3764
+msgid "interface name is longer than 15 characters"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3770
+#, fuzzy
+msgid "interface name is reserved"
+msgstr "インターフェース名と UUID が’必要です\n"
+
+#: ../libnm-core/nm-utils.c:3777
+msgid "interface name contains an invalid character"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+msgid "value is NULL"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+#, fuzzy
+msgid "value is empty"
+msgstr "シークレット値が空でした"
+
+#: ../libnm-core/nm-utils.c:4504
+#, fuzzy, c-format
+msgid "invalid JSON at position %d (%s)"
+msgstr "無効なオプション '%s'"
+
+#: ../libnm-core/nm-utils.c:4516 ../libnm-core/nm-utils.c:4648
+msgid "is not a JSON object"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4618
+msgid "not valid utf-8"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#, fuzzy, c-format
+msgid "cannot load plugin \"%s\": %s"
+msgstr "プラグイン %s をロードできません"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:157
+#: ../libnm-core/nm-vpn-editor-plugin.c:307
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr "'%s' で VPN プラグインをロードできません: 無効なサービス名"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "%s (%s) からの nm_vpn_editor_plugin_factory() のロードに失敗しました"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:173
+#: ../libnm-core/nm-vpn-editor-plugin.c:332
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "プラグイン %s の初期化中に不明なエラーが発生しました"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#: ../libnm-core/nm-vpn-editor-plugin.c:349
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "%s (%s) からの nm_vpn_editor_plugin_factory() のロードに失敗しました"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "'%s' で VPN プラグインをロードできません: 不明なプラグイン名"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:292
+#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "'%s' で VPN プラグインをロードできません: 無効なサービス名"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:501
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "プラグインはインポート機能をサポートしません"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:312
+#: ../libnm-core/nm-vpn-editor-plugin.c:521
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "プラグインはエクスポート機能をサポートしません"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:109
+#: ../libnm-core/nm-vpn-plugin-info.c:110
 #, c-format
 msgid "missing filename"
 msgstr "不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:117
+#: ../libnm-core/nm-vpn-plugin-info.c:118
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "ファイル名は絶対パスである必要があります (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:126
+#: ../libnm-core/nm-vpn-plugin-info.c:127
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "ファイル名の形式が無効です (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:383
+#: ../libnm-core/nm-vpn-plugin-info.c:450
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "競合するプラグイン (%s) が存在します (同じ %s.%s 値を持ちます)。"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:421
+#: ../libnm-core/nm-vpn-plugin-info.c:488
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "同じ名前 (%s) の競合するプラグインが存在します"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:740
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "不明な \"plugin\" 設定"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:750
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:842
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr "VPN プラグイン情報をロードする不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:854
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr "VPN プラグイン情報の不明な名前"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:863
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報の不明なサービス"
 
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
+#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1665
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
+#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1667
+msgid "OLPC Mesh"
+msgstr "OLPC メッシュ"
+
+#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1669
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1683
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1685
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1687
+msgid "VXLAN"
+msgstr "VXLAN"
+
+#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1689
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
+#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1691
+msgid "Tun"
+msgstr "Tun"
+
+#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1693
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
+#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1725
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
+#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1756
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
+#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1758
 msgid "USB"
 msgstr "USB"
 
@@ -8933,9 +9136,9 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#. 
-#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
-#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
+#.
+#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
+#: ../libnm/nm-device.c:1852 ../libnm/nm-device.c:1871
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8970,11 +9173,26 @@ msgstr "パスワードを UCS2 に変換できません: %d"
 msgid "requires '%s' or '%s' setting"
 msgstr "'%s' または '%s' の設定が必要です"
 
+#: ../libnm-util/nm-setting-bond.c:567
+#, c-format
+msgid "'%s' is not a valid interface name for '%s' option"
+msgstr "'%s' は '%s' オプションの有効なインターフェース名ではありません"
+
+#: ../libnm-util/nm-setting-connection.c:834
+#: ../libnm-util/nm-setting-infiniband.c:269
+#, c-format
+msgid "'%s' is not a valid interface name"
+msgstr "'%s' は有効なインターフェース名ではありません"
+
 #: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
 msgstr "接続には '%s' 設定がなければなりません"
 
+#: ../libnm-util/nm-setting-infiniband.c:231
+msgid "not a valid interface name"
+msgstr "無効なインターフェース名です"
+
 #: ../libnm-util/nm-setting-ip4-config.c:957
 #, c-format
 msgid "%d. IPv4 address is invalid"
@@ -8986,17 +9204,17 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d. IPv4 に無効なプレフィックスがあります"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:936
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d. ルートに無効なプレフィックスがあります"
 
-#: ../libnm-util/nm-setting-ip6-config.c:910
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr "%d. IPv6 アドレスは無効です"
 
-#: ../libnm-util/nm-setting-ip6-config.c:920
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
@@ -9016,113 +9234,118 @@ msgstr "シークレットフラグプロパティー '%s' が見つかりませ
 msgid "requires setting '%s' property"
 msgstr "'%s' プロパティの設定が必要です"
 
-#: ../libnm/nm-device-adsl.c:74
+#: ../libnm/nm-device-adsl.c:73
 msgid "The connection was not an ADSL connection."
 msgstr "接続は ADSL 接続ではありませんでした。"
 
-#: ../libnm/nm-device-bond.c:112
+#: ../libnm/nm-device-bond.c:111
 msgid "The connection was not a bond connection."
 msgstr "接続はボンド接続ではありませんでした。"
 
-#: ../libnm/nm-device-bridge.c:112
+#: ../libnm/nm-device-bridge.c:111
 msgid "The connection was not a bridge connection."
 msgstr "接続はブリッジ接続ではありませんでした。"
 
-#: ../libnm/nm-device-bt.c:137
+#: ../libnm/nm-device-bt.c:136
 #, c-format
 msgid "The connection was not a Bluetooth connection."
 msgstr "接続は Bluetooth 接続ではありませんでした。"
 
-#: ../libnm/nm-device-bt.c:146
+#: ../libnm/nm-device-bt.c:145
 msgid "Invalid device Bluetooth address."
 msgstr "無効なデバイス Bluetooth アドレスです。"
 
-#: ../libnm/nm-device-bt.c:153
+#: ../libnm/nm-device-bt.c:152
 msgid "The Bluetooth addresses of the device and the connection didn't match."
 msgstr "デバイスと接続の Bluetooth アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-bt.c:162
+#: ../libnm/nm-device-bt.c:161
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "デバイスには接続に必要な Bluetooth 機能がありません。"
 
-#: ../libnm/nm-device-ethernet.c:207
+#: ../libnm/nm-device-ethernet.c:206
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "接続は Ethernet または PPPoE 接続ではありませんでした。"
 
-#: ../libnm/nm-device-ethernet.c:222
+#: ../libnm/nm-device-ethernet.c:221
 msgid "The connection and device differ in S390 subchannels."
 msgstr "接続とデバイスは S390 サブチャネルで異なります。"
 
-#: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
-#: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-msgid "Invalid device MAC address."
+#: ../libnm/nm-device-ethernet.c:236
+#, fuzzy, c-format
+msgid "Invalid device MAC address %s."
 msgstr "無効なデバイス MAC アドレスです。"
 
-#: ../libnm/nm-device-ethernet.c:237
+#: ../libnm/nm-device-ethernet.c:241
 msgid "The MACs of the device and the connection do not match."
 msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-ethernet.c:247
+#: ../libnm/nm-device-ethernet.c:251
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
 msgstr "ブラックリストの無効な MAC: %s。"
 
-#: ../libnm/nm-device-ethernet.c:253
+#: ../libnm/nm-device-ethernet.c:257
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "デバイス MAC (%s) は接続によりブラックリスト化されています。"
 
-#: ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-generic.c:90
 msgid "The connection was not a generic connection."
 msgstr "接続は汎用的な接続ではありませんでした。"
 
-#: ../libnm/nm-device-generic.c:98
+#: ../libnm/nm-device-generic.c:97
 msgid "The connection did not specify an interface name."
 msgstr "接続でインターフェース名が指定されませんでした。"
 
-#: ../libnm/nm-device-tun.c:209
+#: ../libnm/nm-device-tun.c:208
 msgid "The connection was not a tun connection."
 msgstr "接続は tun 接続ではありませんでした。"
 
-#: ../libnm/nm-device-tun.c:218
+#: ../libnm/nm-device-tun.c:217
 msgid "The mode of the device and the connection didn't match"
 msgstr "デバイスと接続のモードが一致しませんでした"
 
-#: ../libnm/nm-device-infiniband.c:94
+#: ../libnm/nm-device-infiniband.c:93
 msgid "The connection was not an InfiniBand connection."
 msgstr "接続は InfiniBand 接続ではありませんでした。"
 
-#: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
-#: ../libnm/nm-device-wimax.c:333
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
+#: ../libnm/nm-device-wimax.c:324
+msgid "Invalid device MAC address."
+msgstr "無効なデバイス MAC アドレスです。"
+
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
+#: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-ip-tunnel.c:254
+#: ../libnm/nm-device-ip-tunnel.c:253
 msgid "The connection was not an IP tunnel connection."
 msgstr "接続は IP トンネル接続ではありませんでした。"
 
-#: ../libnm/nm-device-macvlan.c:159
+#: ../libnm/nm-device-macvlan.c:158
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "接続は MAC-VLAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:120
+#: ../libnm/nm-device-modem.c:119
 msgid "The connection was not a modem connection."
 msgstr "接続はモデム接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:128
+#: ../libnm/nm-device-modem.c:127
 msgid "The connection was not a valid modem connection."
 msgstr "接続は有効なモデム接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:135
+#: ../libnm/nm-device-modem.c:134
 msgid "The device is lacking capabilities required by the connection."
 msgstr "デバイスには接続に必要な機能がありません。"
 
-#: ../libnm/nm-device-olpc-mesh.c:115
+#: ../libnm/nm-device-olpc-mesh.c:114
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "接続は OLPC メッシュ接続ではありませんでした。"
 
-#: ../libnm/nm-device-team.c:118
+#: ../libnm/nm-device-team.c:138
 msgid "The connection was not a team connection."
 msgstr "接続は team 接続ではありませんでした。"
 
@@ -9134,251 +9357,291 @@ msgstr "接続は VLAN 接続ではありませんでした。"
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "デバイスと接続の VLAN ID が一致しませんでした。"
 
-#: ../libnm/nm-device-vlan.c:148
+#: ../libnm/nm-device-vlan.c:150
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "デバイスと接続のハードウェアアドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-vxlan.c:387
+#: ../libnm/nm-device-vxlan.c:386
 msgid "The connection was not a VXLAN connection."
 msgstr "接続は VXLAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device-vxlan.c:394
+#: ../libnm/nm-device-vxlan.c:393
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
 
-#: ../libnm/nm-device-wifi.c:595
+#: ../libnm/nm-device-wifi.c:590
 msgid "The connection was not a Wi-Fi connection."
 msgstr "接続は Wi-Fi 接続ではありませんでした。"
 
-#: ../libnm/nm-device-wifi.c:631
+#: ../libnm/nm-device-wifi.c:626
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "デバイスには接続に必要な WPA 機能がありません。"
 
-#: ../libnm/nm-device-wifi.c:638
-msgid ""
-"The device is lacking WPA2/RSN capabilities required by the connection."
+#: ../libnm/nm-device-wifi.c:633
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
 
-#: ../libnm/nm-device-wimax.c:317
+#: ../libnm/nm-device-wimax.c:315
 msgid "The connection was not a WiMAX connection."
 msgstr "接続は WiMAX 接続ではありませんでした。"
 
-#: ../libnm/nm-device.c:2729
+#: ../libnm/nm-device.c:2583
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続は有効ではありませんでした: %s"
 
-#: ../libnm/nm-device.c:2738
+#: ../libnm/nm-device.c:2592
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
 
-#: ../libnm/nm-manager.c:874
-msgid "Active connection could not be attached to the device"
-msgstr "アクティブな接続をデバイスに割り当てることができませんでした"
-
-#: ../libnm/nm-manager.c:1098
+#: ../libnm/nm-manager.c:822
 msgid "Active connection removed before it was initialized"
 msgstr "アクティブな接続が初期化前に削除されました"
 
-#: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
-msgid "Caller did not specify D-Bus path for object"
-msgstr "呼び出し元がオブジェクトの D-Bus パスを指定しませんでした"
-
-#: ../libnm/nm-remote-settings.c:261
+#: ../libnm/nm-remote-settings.c:256
 msgid "Connection removed before it was initialized"
 msgstr "接続が初期化前に削除されました"
 
-#: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
+#: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:979
 msgid "No service name specified"
 msgstr "サービス名が指定されていません"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "システムのネットワーキングを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr "システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止されます"
+msgstr ""
+"システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止さ"
+"れます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
+#, fuzzy
+msgid "Reload NetworkManager configuration"
+msgstr "NetworkManager の設定を表示して終了する"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
+#, fuzzy
+msgid "System policy prevents reloading NetworkManager"
+msgstr ""
+"システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止さ"
+"れます"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
-msgstr "NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用はシステムの電源管理に限ってください)"
+msgstr ""
+"NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用は"
+"システムの電源管理に限ってください)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ状態からの解除が阻止されます"
+msgstr ""
+"システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ"
+"状態からの解除が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable WiFi devices"
 msgstr "Wi-Fi デバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling WiFi devices"
-msgstr "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
+msgstr ""
+"システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable mobile broadband devices"
 msgstr "モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr "システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が阻止されています"
+msgstr ""
+"システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が"
+"阻止されています"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "WiMAX モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr "システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無効化が阻止されます"
+msgstr ""
+"システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無"
+"効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Allow control of network connections"
 msgstr "ネットワーク接続の制御を許可"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents control of network connections"
 msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via a protected WiFi network"
 msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid ""
-"System policy prevents sharing connections via a protected WiFi network"
-msgstr "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
+"ます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Connection sharing via an open WiFi network"
 msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+msgstr ""
+"システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
+"止されます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify personal network connections"
 msgstr "個人のネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of personal network settings"
 msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify network connections for all users"
 msgstr "全ユーザーのネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of network settings for all users"
 msgstr "システムポリシーにより全ユーザーのネットワーク設定の編集が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent system hostname"
 msgstr "永続的なシステムのホスト名を修正"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent global DNS configuration"
 msgstr "永続的なグローバル DNS 設定の変更"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr "システムポリシーにより永続的なグローバル DNS 設定の変更が阻止されます"
 
-#: ../shared/nm-shared-utils.c:208
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
+msgid "Perform a checkpoint or rollback of interfaces configuration"
+msgstr ""
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
+#, fuzzy
+msgid "System policy prevents the creation of a checkpoint or its rollback"
+msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
+#, fuzzy
+msgid "Enable or disable device statistics"
+msgstr "Wi-Fi デバイスを有効または無効にする"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
+#, fuzzy
+msgid "System policy prevents enabling or disabling device statistics"
+msgstr ""
+"システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
+
+#: ../shared/nm-utils/nm-shared-utils.c:264
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-shared-utils.c:215
+#: ../shared/nm-utils/nm-shared-utils.c:271
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
+msgstr ""
+"プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
 
-#: ../shared/nm-shared-utils.c:222
+#: ../shared/nm-utils/nm-shared-utils.c:278
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できません"
+msgstr ""
+"コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
+"ん"
 
-#: ../shared/nm-shared-utils.c:230
+#: ../shared/nm-utils/nm-shared-utils.c:286
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプではありません"
+msgstr ""
+"'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
+"ありません"
 
-#: ../shared/nm-shared-utils.c:239
+#: ../shared/nm-utils/nm-shared-utils.c:295
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
 
-#: ../shared/nm-shared-utils.c:250
+#: ../shared/nm-utils/nm-shared-utils.c:306
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr "値 \"%s\" (タイプ '%s') がプロパティー '%s' (タイプ '%s') に対して無効または範囲外です"
+msgstr ""
+"値 \"%s\" (タイプ '%s') がプロパティー '%s' (タイプ '%s') に対して無効または"
+"範囲外です"
 
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:111
+#: ../src/NetworkManagerUtils.c:112
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: ../src/main.c:220 ../src/main.c:358
+#: ../src/main.c:171 ../src/main.c:306
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定の読み込みに失敗しました: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:298
+#: ../src/main.c:185 ../src/nm-iface-helper.c:302
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:299
+#: ../src/main.c:186 ../src/nm-iface-helper.c:303
 msgid "Don't become a daemon"
 msgstr "デーモンにしない"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:301
+#: ../src/main.c:187 ../src/nm-iface-helper.c:305
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] のいずれか"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:303
+#: ../src/main.c:189 ../src/nm-iface-helper.c:307
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:305
+#: ../src/main.c:191 ../src/nm-iface-helper.c:309
 msgid "Make all warnings fatal"
 msgstr "すべての警告を致命的にする"
 
-#: ../src/main.c:241
+#: ../src/main.c:192
 msgid "Specify the location of a PID file"
 msgstr "PID ファイルの場所を指定する"
 
-#: ../src/main.c:242
-msgid "State file location"
-msgstr "状態ファイルの場所"
-
-#: ../src/main.c:244
+#: ../src/main.c:194
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager の設定を表示して終了する"
 
-#: ../src/main.c:254
+#: ../src/main.c:204
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9390,27 +9653,27 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
+#: ../src/main.c:291 ../src/main-utils.c:283 ../src/nm-iface-helper.c:407
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:398
+#: ../src/main.c:296 ../src/nm-iface-helper.c:412
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:373
+#: ../src/main.c:321
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "設定ファイルにエラーが発生しました: %s\n"
 
-#: ../src/main.c:378
+#: ../src/main.c:326
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "設定ファイルにある未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:408
+#: ../src/main.c:337 ../src/nm-iface-helper.c:422
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
@@ -9430,463 +9693,453 @@ msgstr "%s への書き込みに失敗しました: %s\n"
 msgid "Closing %s failed: %s\n"
 msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/main-utils.c:145
+#: ../src/main-utils.c:148 ../src/main-utils.c:156
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "'%s' を作成できません: %s"
 
-#: ../src/main-utils.c:197
+#: ../src/main-utils.c:209
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s はすでに実行中です (pid %ld)\n"
 
-#: ../src/main-utils.c:207
+#: ../src/main-utils.c:219
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "%s! を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:252
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:261
 #, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
 "\n"
-msgstr "# %s からマージされています\n"
+msgstr ""
+"# %s からマージされています\n"
 "\n"
 
-#: ../src/devices/adsl/nm-device-adsl.c:133
-msgid "ADSL connection"
-msgstr "ADSL 接続"
-
-#: ../src/devices/bluetooth/nm-bluez-device.c:197
+#: ../src/devices/bluetooth/nm-bluez-device.c:209
 #, c-format
 msgid "%s Network"
 msgstr "%s ネットワーク"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:253
+#: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN が要求されましたが、Bluetooth デバイスは NAP をサポートしません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:263
+#: ../src/devices/bluetooth/nm-device-bt.c:274
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "PAN 接続は GSM、CDMA、またはシリアル設定を指定できません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:276
+#: ../src/devices/bluetooth/nm-device-bt.c:287
 msgid "PAN connection"
 msgstr "PAN 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:283
+#: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN が要求されましたが、Bluetooth デバイスは DUN をサポートしません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:293
+#: ../src/devices/bluetooth/nm-device-bt.c:304
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 接続には GSM または CDMA 設定が含まれる必要があります"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:655
+#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/wwan/nm-modem-broadband.c:706
 msgid "GSM connection"
 msgstr "GSM 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:679
+#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/wwan/nm-modem-broadband.c:730
 msgid "CDMA connection"
 msgstr "CDMA 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:315
+#: ../src/devices/bluetooth/nm-device-bt.c:326
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "不明な/未処理の Bluetooth 接続タイプ"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:872
+#: ../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
 msgid "connection does not match device"
 msgstr "接続がデバイスに一致しません"
 
-#: ../src/devices/nm-device-bond.c:105
+#: ../src/devices/nm-device-bond.c:109
 msgid "Bond connection"
 msgstr "ボンド接続"
 
-#: ../src/devices/nm-device-bridge.c:111
+#: ../src/devices/nm-device-bridge.c:115
 msgid "Bridge connection"
 msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1489
 msgid "PPPoE connection"
 msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1489
 msgid "Wired connection"
 msgstr "有線接続"
 
-#: ../src/devices/nm-device-ethernet-utils.c:39
+#: ../src/devices/nm-device-ethernet-utils.c:36
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-infiniband.c:175
-msgid "InfiniBand connection"
-msgstr "InfiniBand 接続"
-
-#: ../src/devices/nm-device-ip-tunnel.c:346
+#: ../src/devices/nm-device-ip-tunnel.c:340
 msgid "IP tunnel connection"
 msgstr "IP トンネル接続"
 
-#: ../src/devices/nm-device-macvlan.c:435
+#: ../src/devices/nm-device-macvlan.c:407
 msgid "MACVLAN connection"
 msgstr "MACVLAN 接続"
 
-#: ../src/devices/nm-device-tun.c:129
+#: ../src/devices/nm-device-tun.c:146
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/nm-device-vlan.c:457
-msgid "VLAN connection"
-msgstr "VLAN 接続"
-
-#: ../src/devices/nm-device-vxlan.c:373
-msgid "VXLAN connection"
-msgstr "VXLAN 接続"
-
-#: ../src/devices/team/nm-device-team.c:115
+#: ../src/devices/team/nm-device-team.c:134
 msgid "Team connection"
 msgstr "team 接続"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:146
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:156
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../src/devices/wifi/nm-device-wifi.c:839
+#: ../src/devices/wifi/nm-device-wifi.c:877
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "WPA アドホックはカーネルバグのため無効になりました"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:42
+#: ../src/devices/wifi/nm-wifi-utils.c:43
 #, c-format
 msgid "%s is incompatible with static WEP keys"
 msgstr "%s は静的 WEP キーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:76
+#: ../src/devices/wifi/nm-wifi-utils.c:77
 msgid "LEAP authentication requires a LEAP username"
 msgstr "LEAP 認証には LEAP ユーザー名が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:86
+#: ../src/devices/wifi/nm-wifi-utils.c:87
 msgid "LEAP username requires 'leap' authentication"
 msgstr "LEAP ユーザー名には 'leap' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:99
+#: ../src/devices/wifi/nm-wifi-utils.c:100
 msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr "LEAP 認証には IEEE 802.1x キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:119
+#: ../src/devices/wifi/nm-wifi-utils.c:120
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr "LEAP 認証はアドホックモードと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:131
+#: ../src/devices/wifi/nm-wifi-utils.c:132
 msgid "LEAP authentication is incompatible with 802.1x setting"
 msgstr "LEAP 認証は 802.1x 設定と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:153
+#: ../src/devices/wifi/nm-wifi-utils.c:154
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr "'%s' 認証を使用している接続は WPA キー管理を使用できません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:164
+#: ../src/devices/wifi/nm-wifi-utils.c:165
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr "'%s' 認証を使用している接続は WPA プロトコルを指定できません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:180
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:197
+#: ../src/devices/wifi/nm-wifi-utils.c:181
+#: ../src/devices/wifi/nm-wifi-utils.c:198
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr "'%s' 認証を使用している接続は WPA 暗号を指定できません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:209
+#: ../src/devices/wifi/nm-wifi-utils.c:210
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr "'%s' 認証を使用している接続は WPA パスワードを指定できません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:240
+#: ../src/devices/wifi/nm-wifi-utils.c:241
 msgid "Dynamic WEP requires an 802.1x setting"
 msgstr "動的 WEP には 802.1x 設定が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:250
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:278
+#: ../src/devices/wifi/nm-wifi-utils.c:251
+#: ../src/devices/wifi/nm-wifi-utils.c:279
 msgid "Dynamic WEP requires 'open' authentication"
 msgstr "動的 WEP には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:265
+#: ../src/devices/wifi/nm-wifi-utils.c:266
 msgid "Dynamic WEP requires 'ieee8021x' key management"
 msgstr "動的 WEP には 'ieee8021x' キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:312
+#: ../src/devices/wifi/nm-wifi-utils.c:313
 msgid "WPA-PSK authentication is incompatible with 802.1x"
 msgstr "WPA-PSK 認証は 802.1x と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:322
+#: ../src/devices/wifi/nm-wifi-utils.c:323
 msgid "WPA-PSK requires 'open' authentication"
 msgstr "WPA-PSK には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:334
+#: ../src/devices/wifi/nm-wifi-utils.c:335
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
 msgstr "WPA アドホック認証にはアドホックモード AP が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:347
+#: ../src/devices/wifi/nm-wifi-utils.c:348
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
 msgstr "WPA アドホック認証には 'wpa' プロトコルが必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:359
+#: ../src/devices/wifi/nm-wifi-utils.c:360
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
 msgstr "WPA アドホック認証には 'none' ペア暗号が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:371
+#: ../src/devices/wifi/nm-wifi-utils.c:372
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
 msgstr "WPA アドホック認証には 'tkip' グループ暗号が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:385
+#: ../src/devices/wifi/nm-wifi-utils.c:386
 msgid "Access point does not support PSK but setting requires it"
 msgstr "アクセスポイントは PSK をサポートしませんが、設定では PSK が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:415
+#: ../src/devices/wifi/nm-wifi-utils.c:416
 msgid "WPA-EAP authentication requires an 802.1x setting"
 msgstr "WPA-EAP 認証には 802.1x 設定が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:425
+#: ../src/devices/wifi/nm-wifi-utils.c:426
 msgid "WPA-EAP requires 'open' authentication"
 msgstr "WPA-EAP には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:436
+#: ../src/devices/wifi/nm-wifi-utils.c:437
 msgid "802.1x setting requires 'wpa-eap' key management"
 msgstr "802.1x 設定には 'wpa-eap' キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:449
+#: ../src/devices/wifi/nm-wifi-utils.c:450
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr "アクセスポイントは 802.1x をサポートしませんが、設定では 802.1x 必要です"
+msgstr ""
+"アクセスポイントは 802.1x をサポートしませんが、設定では 802.1x 必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:477
+#: ../src/devices/wifi/nm-wifi-utils.c:478
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr "アクセスポイントモードはアドホックですが、設定ではインフラストラクチャーセキュリティーが必要です"
+msgstr ""
+"アクセスポイントモードはアドホックですが、設定ではインフラストラクチャーセ"
+"キュリティーが必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:487
+#: ../src/devices/wifi/nm-wifi-utils.c:488
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
 msgstr "アドホックモードは 802.1x セキュリティーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:496
+#: ../src/devices/wifi/nm-wifi-utils.c:497
 msgid "Ad-Hoc mode is incompatible with LEAP security"
 msgstr "アドホックモードは LEAP セキュリティーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:506
+#: ../src/devices/wifi/nm-wifi-utils.c:507
 msgid "Ad-Hoc mode requires 'open' authentication"
 msgstr "アドホックモードには 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:516
+#: ../src/devices/wifi/nm-wifi-utils.c:517
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr "アクセスポイントモードはインフラストラクチャーですが、設定ではアドホックセキュリティーが必要です"
+msgstr ""
+"アクセスポイントモードはインフラストラクチャーですが、設定ではアドホックセ"
+"キュリティーが必要です"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:558
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:588
+#: ../src/devices/wifi/nm-wifi-utils.c:559
+#: ../src/devices/wifi/nm-wifi-utils.c:589
 #, c-format
 msgid "connection does not match access point"
 msgstr "接続がアクセスポイントに一致しません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:612
+#: ../src/devices/wifi/nm-wifi-utils.c:613
 msgid "Access point is unencrypted but setting specifies security"
-msgstr "アクセスポイントは暗号化されていませんが、設定ではセキュリティーが指定されています"
+msgstr ""
+"アクセスポイントは暗号化されていませんが、設定ではセキュリティーが指定されて"
+"います"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:701
+#: ../src/devices/wifi/nm-wifi-utils.c:702
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr "WPA 認証は非 EAP (オリジナル) LEAP または動的 WEP と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:711
+#: ../src/devices/wifi/nm-wifi-utils.c:712
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr "WPA 認証は共有キー認証と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:758
+#: ../src/devices/wifi/nm-wifi-utils.c:759
 msgid "Failed to determine AP security information"
 msgstr "AP セキュリティー情報の決定に失敗しました。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:641
+#: ../src/devices/wwan/nm-modem-broadband.c:692
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
 
-#: ../src/nm-config.c:465
+#: ../src/nm-config.c:466
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:466
+#: ../src/nm-config.c:467
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:467
+#: ../src/nm-config.c:468
 msgid "System config directory location"
 msgstr "システム設定ディレクトリーの場所"
 
-#: ../src/nm-config.c:468
+#: ../src/nm-config.c:469
 msgid "Internal config file location"
 msgstr "内部設定ファイルの場所"
 
-#: ../src/nm-config.c:469
+#: ../src/nm-config.c:470
+msgid "State file location"
+msgstr "状態ファイルの場所"
+
+#: ../src/nm-config.c:471
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デバイスの状態ファイル"
 
-#: ../src/nm-config.c:470
+#: ../src/nm-config.c:472
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを「,」で区切った一覧"
 
-#: ../src/nm-config.c:471
+#: ../src/nm-config.c:473
 msgid "Quit after initial configuration"
 msgstr "初期設定後に終了する"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:474 ../src/nm-iface-helper.c:304
 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:475
+#: ../src/nm-config.c:477
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:476
+#: ../src/nm-config.c:478
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:477
+#: ../src/nm-config.c:479
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:284
 msgid "The interface to manage"
 msgstr "管理するインターフェース"
 
-#: ../src/nm-iface-helper.c:281
-msgid "eth0"
-msgstr "eth0"
-
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:285
 msgid "Connection UUID"
 msgstr "接続 UUID"
 
-#: ../src/nm-iface-helper.c:282
-msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
+#: ../src/nm-iface-helper.c:286
+#, fuzzy
+msgid "Connection Token for Stable IDs"
+msgstr "接続プロファイルの詳細"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:287
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "IPv6 SLAAC を管理するかどうか"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:288
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:289
 msgid "Use an IPv6 temporary privacy address"
 msgstr "IPv6 一時プライバシーアドレスの使用"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:290
 msgid "Current DHCPv4 address"
 msgstr "現在の DHCPv4 アドレス"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:291
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:292
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "16 進エンコードされた DHCPv4 クライアント ID"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:293
 msgid "Hostname to send to DHCP server"
 msgstr "DHCP サーバーに送信するホスト名"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:293
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:294
 msgid "FQDN to send to DHCP server"
 msgstr "DHCP サーバーに送信する FQDN"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:294
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:295
 msgid "Route priority for IPv4"
 msgstr "IPv4 のルート優先度"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:295
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:296
 msgid "Route priority for IPv6"
 msgstr "IPv6 のルート優先度"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:296
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:297
 msgid "Hex-encoded Interface Identifier"
 msgstr "16 進エンコードされたインターフェース ID"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:298
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC アドレス生成モード"
 
-#: ../src/nm-iface-helper.c:295
+#: ../src/nm-iface-helper.c:299
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照してください"
+msgstr ""
+"ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照して"
+"ください"
 
-#: ../src/nm-iface-helper.c:315
+#: ../src/nm-iface-helper.c:319
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタンドアロンプロセスです。"
+msgstr ""
+"nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
+"ドアロンプロセスです。"
 
-#: ../src/nm-iface-helper.c:374
+#: ../src/nm-iface-helper.c:388
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "インターフェース名と UUID が’必要です\n"
 
-#: ../src/nm-iface-helper.c:380
+#: ../src/nm-iface-helper.c:394
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
 
-#: ../src/nm-iface-helper.c:442
+#: ../src/nm-iface-helper.c:456
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効な IID %s\n"
 
-#: ../src/nm-logging.c:216
+#: ../src/nm-logging.c:266
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:309
+#: ../src/nm-logging.c:368
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/nm-manager.c:3635
-msgid "VPN connection"
-msgstr "VPN 接続"
-
-#: ../src/nm-sleep-monitor-systemd.c:131
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager でネットワークをオフにする必要があります"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:108
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:107
 msgid "System"
 msgstr "システム"