From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Fri, 25 Jan 2019 11:24:41 +0100
Subject: New upstream version 1.15.2

---
 po/ja.po | 2566 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1337 insertions(+), 1229 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 08acdec7..fd02dc2b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-16 15:38+0200\n"
+"POT-Creation-Date: 2019-01-08 18:22+0100\n"
 "PO-Revision-Date: 2018-08-16 01:39+0000\n"
 "Last-Translator: kemorigu <kemorigu@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -114,7 +114,7 @@ msgstr "nmcli が polkit エージェントとして適切に登録されまし
 
 #: ../clients/cli/common.c:361 ../clients/cli/common.c:362
 #: ../clients/cli/common.c:393 ../clients/cli/common.c:394
-#: ../clients/cli/connections.c:1390
+#: ../clients/cli/connections.c:1454
 msgid "GROUP"
 msgstr "グループ"
 
@@ -133,7 +133,7 @@ msgstr "エラー: openconnect がステータス %d で失敗しました\n"
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
 
-#: ../clients/cli/common.c:710
+#: ../clients/cli/common.c:711
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -142,126 +142,138 @@ msgstr ""
 "警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
 "ask' オプションがないと尋ねることができません。\n"
 
-#: ../clients/cli/common.c:1200
+#: ../clients/cli/common.c:1211
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
 
-#: ../clients/cli/common.c:1220
+#: ../clients/cli/common.c:1231
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager が起動していません。"
 
-#: ../clients/cli/common.c:1316
+#: ../clients/cli/common.c:1327
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "エラー: 引数 '%s' が認識されません。代わりに --help を渡してください。"
 
-#: ../clients/cli/common.c:1326
+#: ../clients/cli/common.c:1337
 msgid "Error: missing argument. Try passing --help."
 msgstr "エラー: 引数がありません。--help を渡してください。"
 
-#: ../clients/cli/common.c:1379
+#: ../clients/cli/common.c:1390
 msgid "access denied"
 msgstr "アクセスは拒否されました"
 
+#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444
+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543
+#: ../clients/cli/general.c:41 ../clients/cli/general.c:129
+#: ../clients/cli/general.c:134 ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:282
+#: ../clients/common/nm-meta-setting-desc.c:1567
+#: ../clients/common/nm-meta-setting-desc.c:1617
+#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2812
+msgid "unknown"
+msgstr "不明"
+
+#: ../clients/cli/common.c:1399
+msgid "none"
+msgstr "なし"
+
+#: ../clients/cli/common.c:1400
+msgid "portal"
+msgstr "ポータル"
+
+#: ../clients/cli/common.c:1401
+msgid "limited"
+msgstr "制限付き"
+
+#: ../clients/cli/common.c:1402
+msgid "full"
+msgstr "完全"
+
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:65
 msgid "Setting name? "
 msgstr "設定名は? "
 
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:66
 msgid "Property name? "
 msgstr "プロパティー名は? "
 
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:67
 msgid "Enter connection type: "
 msgstr "接続タイプを入力してください: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:70
-#, fuzzy
+#: ../clients/cli/connections.c:71
 msgid "Connection (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス)"
+msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:71
-#, fuzzy
+#: ../clients/cli/connections.c:72
 msgid "VPN connection (name, UUID, or path): "
-msgstr "VPN 接続 (名前、UUID またはパス)"
+msgstr "VPN 接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:72
-#, fuzzy
+#: ../clients/cli/connections.c:73
 msgid "Connection(s) (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス)"
+msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:73
-#, fuzzy
+#: ../clients/cli/connections.c:74
 msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "接続 (名前、UUID、パス または apath)"
-
-#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
-#: ../clients/cli/devices.c:421 ../clients/cli/devices.c:513
-#: ../clients/cli/devices.c:520 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
-#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-client-utils.c:273
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:1519
-#: ../clients/common/nm-meta-setting-desc.c:1569
-#: ../clients/common/nm-meta-setting-desc.c:2716
-#: ../clients/common/nm-meta-setting-desc.c:2771
-msgid "unknown"
-msgstr "不明"
+msgstr "接続 (名前、UUID、パス または apath): "
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:82
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:83
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271
+#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
 msgid "deactivating"
 msgstr "停止中"
 
-#: ../clients/cli/connections.c:84
+#: ../clients/cli/connections.c:85
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:90
+#: ../clients/cli/connections.c:91
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続（準備）"
 
-#: ../clients/cli/connections.c:91
+#: ../clients/cli/connections.c:92
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続（認証が必要）"
 
-#: ../clients/cli/connections.c:92
+#: ../clients/cli/connections.c:93
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:93
+#: ../clients/cli/connections.c:94
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続（IP 設定を取得）"
 
-#: ../clients/cli/connections.c:94
+#: ../clients/cli/connections.c:95
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:95
+#: ../clients/cli/connections.c:96
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:96
+#: ../clients/cli/connections.c:97
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:464
+#: ../clients/cli/connections.c:518
 msgid "never"
 msgstr "しない"
 
-#: ../clients/cli/connections.c:814
+#: ../clients/cli/connections.c:868
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -338,7 +350,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:836
+#: ../clients/cli/connections.c:890
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -387,7 +399,7 @@ msgstr ""
 "関連するシークレットも表示する場合は、グローバルな --show-secrets オプション"
 "を使用します。\n"
 
-#: ../clients/cli/connections.c:857
+#: ../clients/cli/connections.c:911
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -431,7 +443,7 @@ msgstr ""
 "passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:878
+#: ../clients/cli/connections.c:932
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -453,8 +465,8 @@ msgstr ""
 "で識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:890
-#, c-format
+#: ../clients/cli/connections.c:944
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -591,9 +603,9 @@ msgid ""
 "                  [destination-port <0-65535>]\n"
 "\n"
 "    wpan:         [short-addr <0x0000-0xffff>]\n"
-"\n"
 "                  [pan-id <0x0000-0xffff>]\n"
-"\n"
+"                  [page <default|0-31>]\n"
+"                  [channel <default|0-26>]\n"
 "                  [mac <MAC address>]\n"
 "\n"
 "    6lowpan:      dev <parent device (connection UUID, ifname, or MAC)>\n"
@@ -765,7 +777,7 @@ msgstr ""
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 
-#: ../clients/cli/connections.c:1012
+#: ../clients/cli/connections.c:1068
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -811,7 +823,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1035
+#: ../clients/cli/connections.c:1091
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -834,7 +846,7 @@ msgstr ""
 "を除き、<ID> の完全なコピーになります。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1047
+#: ../clients/cli/connections.c:1103
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -861,7 +873,7 @@ msgstr ""
 "インテラクティブなエディターで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1062
+#: ../clients/cli/connections.c:1118
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -880,7 +892,7 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1073
+#: ../clients/cli/connections.c:1129
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -901,7 +913,7 @@ msgstr ""
 "何も指定されない場合は、すべての接続プロファイルを監視します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1085
+#: ../clients/cli/connections.c:1141
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -913,7 +925,7 @@ msgstr ""
 "\n"
 "ディスクからすべての接続ファイルを再読み込みします。\n"
 
-#: ../clients/cli/connections.c:1093
+#: ../clients/cli/connections.c:1149
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -935,7 +947,7 @@ msgstr ""
 "NetworkManager に最新の状態を認識させてください。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1105
+#: ../clients/cli/connections.c:1161
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -959,7 +971,7 @@ msgstr ""
 "NetworkManager VPN プラグインによりインポートされます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1118
+#: ../clients/cli/connections.c:1174
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -978,343 +990,348 @@ msgstr ""
 "データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1200
+#: ../clients/cli/connections.c:1264
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/connections.c:1243
+#: ../clients/cli/connections.c:1307
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:1256 ../clients/cli/connections.c:1341
+#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:1331
+#: ../clients/cli/connections.c:1395
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../clients/cli/connections.c:1439 ../clients/cli/devices.c:1484
-#: ../clients/cli/devices.c:1498 ../clients/cli/devices.c:1513
-#: ../clients/cli/devices.c:1571 ../clients/cli/devices.c:1673
+#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
+#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
+#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642
 msgid "NAME"
 msgstr "名前"
 
-#: ../clients/cli/connections.c:1527
+#: ../clients/cli/connections.c:1591
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 "無効なフィールド '%s'; 使用できるフィールド: %s および %s、または %s、%s"
 
-#: ../clients/cli/connections.c:1542 ../clients/cli/connections.c:1550
+#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' は孤立させる必要があります"
 
-#: ../clients/cli/connections.c:1815
+#: ../clients/cli/connections.c:1876
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "'--order' オプションの正しくない文字列 '%s'"
 
-#: ../clients/cli/connections.c:1840
+#: ../clients/cli/connections.c:1901
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "'--order' オプションの正しくないアイテム '%s'"
 
-#: ../clients/cli/connections.c:1878
+#: ../clients/cli/connections.c:1939
 msgid "No connection specified"
 msgstr "接続が指定されていません。"
 
-#: ../clients/cli/connections.c:1889
+#: ../clients/cli/connections.c:1950
 #, c-format
 msgid "%s argument is missing"
 msgstr "%s 引数がありません。"
 
-#: ../clients/cli/connections.c:1907
+#: ../clients/cli/connections.c:1968
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "不明な接続 '%s'"
 
-#: ../clients/cli/connections.c:1936
+#: ../clients/cli/connections.c:1997
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数がありません"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2057
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager のアクティブなプロファイル"
 
-#: ../clients/cli/connections.c:1998
+#: ../clients/cli/connections.c:2058
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../clients/cli/connections.c:2050 ../clients/cli/connections.c:2757
-#: ../clients/cli/connections.c:2769 ../clients/cli/connections.c:2781
-#: ../clients/cli/connections.c:3007 ../clients/cli/connections.c:8710
-#: ../clients/cli/connections.c:8726 ../clients/cli/devices.c:3037
-#: ../clients/cli/devices.c:3049 ../clients/cli/devices.c:3062
-#: ../clients/cli/devices.c:3213 ../clients/cli/devices.c:3224
-#: ../clients/cli/devices.c:3242 ../clients/cli/devices.c:3251
-#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3283
-#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3681
-#: ../clients/cli/devices.c:3691 ../clients/cli/devices.c:3699
-#: ../clients/cli/devices.c:3711 ../clients/cli/devices.c:3726
-#: ../clients/cli/devices.c:3734 ../clients/cli/devices.c:3908
-#: ../clients/cli/devices.c:3919 ../clients/cli/devices.c:4090
+#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
+#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
+#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899
+#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976
+#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001
+#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206
+#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265
+#: ../clients/cli/devices.c:3283 ../clients/cli/devices.c:3725
+#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3952
+#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:2078
+#: ../clients/cli/connections.c:2138
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - そのような接続プロファイルはありません。"
 
-#: ../clients/cli/connections.c:2169 ../clients/cli/connections.c:2744
-#: ../clients/cli/connections.c:2808 ../clients/cli/connections.c:8234
-#: ../clients/cli/connections.c:8340 ../clients/cli/connections.c:8826
-#: ../clients/cli/devices.c:1758 ../clients/cli/devices.c:2044
-#: ../clients/cli/devices.c:2213 ../clients/cli/devices.c:2321
-#: ../clients/cli/devices.c:2510 ../clients/cli/devices.c:3871
-#: ../clients/cli/devices.c:4096 ../clients/cli/general.c:917
+#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
+#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
+#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015
+#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995
+#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276
+#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915
+#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:2262
+#: ../clients/cli/connections.c:2322
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:2270
+#: ../clients/cli/connections.c:2330
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:2290
-#, c-format
-msgid "device '%s' not compatible with connection '%s':"
+#: ../clients/cli/connections.c:2350
+#, fuzzy, c-format
+msgid "device '%s' not compatible with connection '%s': "
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません:"
 
-#: ../clients/cli/connections.c:2323
+#: ../clients/cli/connections.c:2383
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:2326
+#: ../clients/cli/connections.c:2386
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:2358
+#: ../clients/cli/connections.c:2437
+#, c-format
+msgid "Hint: use '%s' to get more details."
+msgstr ""
+
+#: ../clients/cli/connections.c:2455
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (%s) (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2362 ../clients/cli/connections.c:2510
-#: ../clients/cli/connections.c:6598
+#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
+#: ../clients/cli/connections.c:6716
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2369 ../clients/cli/connections.c:2490
+#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../clients/cli/connections.c:2405
+#: ../clients/cli/connections.c:2503
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: タイムアウト (%d 秒) になりました"
 
-#: ../clients/cli/connections.c:2572
+#: ../clients/cli/connections.c:2671
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2585
+#: ../clients/cli/connections.c:2684
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にコロンがありません"
 
-#: ../clients/cli/connections.c:2593
+#: ../clients/cli/connections.c:2692
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にドットがありません"
 
-#: ../clients/cli/connections.c:2606
+#: ../clients/cli/connections.c:2705
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' の設定名が無効です"
 
-#: ../clients/cli/connections.c:2660
+#: ../clients/cli/connections.c:2759
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2665
+#: ../clients/cli/connections.c:2764
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../clients/cli/connections.c:2791 ../clients/cli/devices.c:1717
-#: ../clients/cli/devices.c:3094 ../clients/cli/devices.c:3314
-#: ../clients/cli/devices.c:3925
+#: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686
+#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
+#: ../clients/cli/devices.c:3969
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2816
+#: ../clients/cli/connections.c:2915
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2924
+#: ../clients/cli/connections.c:3024
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:2940
+#: ../clients/cli/connections.c:3040
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2989 ../clients/cli/connections.c:8447
-#: ../clients/cli/connections.c:8478 ../clients/cli/connections.c:8636
+#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
+#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:3019
+#: ../clients/cli/connections.c:3121
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
 
-#: ../clients/cli/connections.c:3020
+#: ../clients/cli/connections.c:3122
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブな一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:3028
+#: ../clients/cli/connections.c:3130
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:3059
+#: ../clients/cli/connections.c:3161
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "接続 '%s' の非アクティブ化に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:3310 ../clients/cli/connections.c:3367
+#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
 #: ../clients/common/nm-client-utils.c:221
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3330 ../clients/cli/connections.c:3390
+#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492
 #: ../clients/common/nm-client-utils.c:289
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../clients/cli/connections.c:3524
+#: ../clients/cli/connections.c:3626
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
 
-#: ../clients/cli/connections.c:3873
+#: ../clients/cli/connections.c:3979
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "エラー: 無効なプロパティー '%s': %s。"
 
-#: ../clients/cli/connections.c:3890
+#: ../clients/cli/connections.c:3996
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:3910
+#: ../clients/cli/connections.c:4016
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
 
-#: ../clients/cli/connections.c:3944
+#: ../clients/cli/connections.c:4050
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "エラー: '%s' は必須です。"
 
-#: ../clients/cli/connections.c:3971
+#: ../clients/cli/connections.c:4077
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "エラー: 無効なスレーブタイプ; %s。"
 
-#: ../clients/cli/connections.c:3979
+#: ../clients/cli/connections.c:4085
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:4056
+#: ../clients/cli/connections.c:4162
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "エラー: 問題のある接続タイプ: %s"
 
-#: ../clients/cli/connections.c:4102
+#: ../clients/cli/connections.c:4208
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "エラー: '%s': %s"
 
-#: ../clients/cli/connections.c:4123
+#: ../clients/cli/connections.c:4229
 msgid "Error: master is required"
 msgstr "エラー: マスターが必要です"
 
-#: ../clients/cli/connections.c:4182
+#: ../clients/cli/connections.c:4288
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "エラー: ボンドオプション '%s=%s' の追加中にエラー。"
 
-#: ../clients/cli/connections.c:4213
+#: ../clients/cli/connections.c:4319
 #, 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:4244
+#: ../clients/cli/connections.c:4350
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "エラー: 'bt-type': '%s' は無効です。[%s, %s, %s (%s), %s] を使用してくださ"
 "い。"
 
-#: ../clients/cli/connections.c:4493
+#: ../clients/cli/connections.c:4599
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' の値が不明です。"
 
-#: ../clients/cli/connections.c:4539
+#: ../clients/cli/connections.c:4645
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:4668
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:4608 ../clients/cli/connections.c:4624
+#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "エラー:'%s' があいまいです (%s.%s または %s.%s)。"
 
-#: ../clients/cli/connections.c:4642
+#: ../clients/cli/connections.c:4748
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "エラー: 無効な <setting>.<property> '%s' です。"
 
-#: ../clients/cli/connections.c:4686 ../clients/cli/connections.c:8280
+#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
 
-#: ../clients/cli/connections.c:4704
+#: ../clients/cli/connections.c:4810
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1326,32 +1343,32 @@ msgstr[0] ""
 "警告: 名前が '%1$s' の接続が他に %3$u 個あります。uuid が '%2$s' の接続を参照"
 "してください。\n"
 
-#: ../clients/cli/connections.c:4713
+#: ../clients/cli/connections.c:4819
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../clients/cli/connections.c:4766 ../clients/cli/connections.c:6715
-#: ../clients/cli/connections.c:6716 ../clients/cli/devices.c:512
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:157 ../clients/cli/utils.h:292
+#: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
+#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
+#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207
+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
 #: ../clients/common/nm-client-utils.c:279
-#: ../clients/common/nm-meta-setting-desc.c:763
-#: ../clients/common/nm-meta-setting-desc.c:2711
+#: ../clients/common/nm-meta-setting-desc.c:771
+#: ../clients/common/nm-meta-setting-desc.c:2752
 msgid "no"
 msgstr "いいえ"
 
-#: ../clients/cli/connections.c:4767 ../clients/cli/connections.c:6715
-#: ../clients/cli/connections.c:6716 ../clients/cli/devices.c:511
-#: ../clients/cli/devices.c:518 ../clients/cli/devices.c:1238
-#: ../clients/cli/general.c:156 ../clients/cli/utils.h:292
+#: ../clients/cli/connections.c:4873 ../clients/cli/connections.c:6839
+#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534
+#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207
+#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296
 #: ../clients/common/nm-client-utils.c:278
-#: ../clients/common/nm-meta-setting-desc.c:763
-#: ../clients/common/nm-meta-setting-desc.c:2708
+#: ../clients/common/nm-meta-setting-desc.c:771
+#: ../clients/common/nm-meta-setting-desc.c:2749
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/connections.c:4853
+#: ../clients/cli/connections.c:4959
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1360,34 +1377,34 @@ msgstr ""
 "さい。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4952
+#: ../clients/cli/connections.c:5061
 #, 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:4955
+#: ../clients/cli/connections.c:5067
 #, 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:5088 ../clients/cli/utils.c:294
+#: ../clients/cli/connections.c:5200 ../clients/cli/utils.c:295
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "エラー: '%s' 引数の値が必要です。"
 
-#: ../clients/cli/connections.c:5095
+#: ../clients/cli/connections.c:5207
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:5181 ../clients/cli/connections.c:5192
+#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "エラー: '%s' 引数が必要です。"
 
-#: ../clients/cli/connections.c:6157
+#: ../clients/cli/connections.c:6269
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
@@ -1395,7 +1412,7 @@ msgstr "['%s' 設定値]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6266
+#: ../clients/cli/connections.c:6378
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1428,7 +1445,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:6293
+#: ../clients/cli/connections.c:6405
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1447,7 +1464,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6300
+#: ../clients/cli/connections.c:6412
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1468,7 +1485,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:6419
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1483,7 +1500,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:6424
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1496,7 +1513,7 @@ msgstr ""
 "プロパティー詳細を表示します。NM の設定およびプロパティーの全詳細については、"
 "nm-settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6317
+#: ../clients/cli/connections.c:6429
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1511,7 +1528,7 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6322
+#: ../clients/cli/connections.c:6434
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1536,7 +1553,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6331
+#: ../clients/cli/connections.c:6443
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1562,7 +1579,7 @@ msgstr ""
 "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
 "必要があります。\n"
 
-#: ../clients/cli/connections.c:6342
+#: ../clients/cli/connections.c:6454
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1583,7 +1600,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
 "は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:6349 ../clients/cli/connections.c:6507
+#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1592,7 +1609,7 @@ msgstr ""
 "back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:6352
+#: ../clients/cli/connections.c:6464
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1601,7 +1618,7 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6355
+#: ../clients/cli/connections.c:6467
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1628,7 +1645,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6377 ../clients/cli/connections.c:6513
+#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1641,8 +1658,8 @@ msgstr ""
 "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
 "求められます。\n"
 
-#: ../clients/cli/connections.c:6382 ../clients/cli/connections.c:6518
-#: ../clients/cli/connections.c:6937 ../clients/cli/connections.c:7864
+#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
+#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "不明なコマンド: '%s'\n"
@@ -1650,7 +1667,7 @@ msgstr "不明なコマンド: '%s'\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6447
+#: ../clients/cli/connections.c:6559
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1676,7 +1693,7 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:6472
+#: ../clients/cli/connections.c:6584
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1687,7 +1704,7 @@ msgstr ""
 "\n"
 "このプロパティーに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:6476
+#: ../clients/cli/connections.c:6588
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1702,7 +1719,7 @@ msgstr ""
 "<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
 "プロパティー値が置換されます ('set' の場合と同じ)。\n"
 
-#: ../clients/cli/connections.c:6482
+#: ../clients/cli/connections.c:6594
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1713,7 +1730,7 @@ msgstr ""
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:6486
+#: ../clients/cli/connections.c:6598
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1748,7 +1765,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6497
+#: ../clients/cli/connections.c:6609
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1761,7 +1778,7 @@ msgstr ""
 "プロパティーの詳細を表示します。NM 設定とプロパティーの詳細は、nm-"
 "settings(5) man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6502
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1775,7 +1792,7 @@ msgstr ""
 "プロパティー値を表示します。引数を指定すると、設定または接続全体の値を表示さ"
 "せることもできます。\n"
 
-#: ../clients/cli/connections.c:6510
+#: ../clients/cli/connections.c:6622
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1784,28 +1801,28 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6604
+#: ../clients/cli/connections.c:6722
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続のアクティベートに失敗しました。\n"
 
-#: ../clients/cli/connections.c:6695
+#: ../clients/cli/connections.c:6819
 #, 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:6713
+#: ../clients/cli/connections.c:6837
 #, 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:6749
+#: ../clients/cli/connections.c:6873
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "この接続は保存されません。本当に終了しますか? %s"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:6915
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1814,66 +1831,66 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
 "で 'save' と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:6826 ../clients/cli/connections.c:7218
-#: ../clients/cli/connections.c:7276
+#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7364
+#: ../clients/cli/connections.c:7424
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティーに使用できる値: %s\n"
 
-#: ../clients/cli/connections.c:6829 ../clients/cli/connections.c:7221
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:6953 ../clients/cli/connections.c:7368
+#: ../clients/cli/connections.c:7428
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:6843 ../clients/cli/connections.c:6863
-#: ../clients/cli/connections.c:7225 ../clients/cli/connections.c:7284
+#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990
+#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティーの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6857
+#: ../clients/cli/connections.c:6983
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:6883 ../clients/cli/settings.c:394
+#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:6889 ../clients/cli/connections.c:7379
-#: ../clients/cli/connections.c:7430
+#: ../clients/cli/connections.c:7017 ../clients/cli/connections.c:7532
+#: ../clients/cli/connections.c:7583
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6910
+#: ../clients/cli/connections.c:7038
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:7129
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:7012
+#: ../clients/cli/connections.c:7141
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:7029
+#: ../clients/cli/connections.c:7159
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "利用可能なプロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7037
+#: ../clients/cli/connections.c:7167
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティー %s\n"
 
-#: ../clients/cli/connections.c:7078
+#: ../clients/cli/connections.c:7212
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1884,12 +1901,12 @@ msgstr ""
 "ベートされる可能性があります。\n"
 "本当に保存しますか? %s"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:7298
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:7186
+#: ../clients/cli/connections.c:7329
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1898,413 +1915,418 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。'save' と入力す"
 "ると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:7229 ../clients/cli/connections.c:7474
-#: ../clients/cli/connections.c:7506
+#: ../clients/cli/connections.c:7377 ../clients/cli/connections.c:7628
+#: ../clients/cli/connections.c:7660
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません。有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:7230
+#: ../clients/cli/connections.c:7378
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
 "ください。\n"
 
-#: ../clients/cli/connections.c:7245 ../clients/cli/connections.c:7406
-#: ../clients/cli/connections.c:7496
+#: ../clients/cli/connections.c:7393 ../clients/cli/connections.c:7559
+#: ../clients/cli/connections.c:7650
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です。[%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7254
+#: ../clients/cli/connections.c:7402
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティー用の設定がありません\n"
 
-#: ../clients/cli/connections.c:7261
+#: ../clients/cli/connections.c:7409
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7315
+#: ../clients/cli/connections.c:7466
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:7340
+#: ../clients/cli/connections.c:7491
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティーになります: %s\n"
 
-#: ../clients/cli/connections.c:7384
+#: ../clients/cli/connections.c:7537
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません。[%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7556
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には、設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:7451
+#: ../clients/cli/connections.c:7604
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティー、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7475 ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
 "用してください\n"
 
-#: ../clients/cli/connections.c:7530
+#: ../clients/cli/connections.c:7684
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティー: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7560
+#: ../clients/cli/connections.c:7714
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7565
+#: ../clients/cli/connections.c:7719
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: この接続には、設定 '%s' がありません。\n"
 
-#: ../clients/cli/connections.c:7596
+#: ../clients/cli/connections.c:7750
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティー: %s%s\n"
 
-#: ../clients/cli/connections.c:7598
+#: ../clients/cli/connections.c:7752
 msgid ", neither a valid setting name"
 msgstr "有効な設定名でもありません。"
 
-#: ../clients/cli/connections.c:7614
+#: ../clients/cli/connections.c:7768
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効な検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7622
+#: ../clients/cli/connections.c:7776
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:7637
+#: ../clients/cli/connections.c:7791
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:7794
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的に修正できません。\n"
 
-#: ../clients/cli/connections.c:7657
+#: ../clients/cli/connections.c:7815
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7689
+#: ../clients/cli/connections.c:7867
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7696
+#: ../clients/cli/connections.c:7873
+#, fuzzy, c-format
+msgid "Error: Timeout saving '%s' (%s) connection\n"
+msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
+
+#: ../clients/cli/connections.c:7878
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:7697
+#: ../clients/cli/connections.c:7879
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) が正常に更新されました。\n"
 
-#: ../clients/cli/connections.c:7729
+#: ../clients/cli/connections.c:7912
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7730
+#: ../clients/cli/connections.c:7913
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:7731
+#: ../clients/cli/connections.c:7914
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
 
-#: ../clients/cli/connections.c:7753
+#: ../clients/cli/connections.c:7936
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:7757
+#: ../clients/cli/connections.c:7940
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:7767
+#: ../clients/cli/connections.c:7950
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:7776
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7782
+#: ../clients/cli/connections.c:7966
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:7818
+#: ../clients/cli/connections.c:8002
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7826
+#: ../clients/cli/connections.c:8010
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7834
+#: ../clients/cli/connections.c:8018
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7841
+#: ../clients/cli/connections.c:8025
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:7849
+#: ../clients/cli/connections.c:8033
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] は指定できます\n"
 
-#: ../clients/cli/connections.c:8067
+#: ../clients/cli/connections.c:8251
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
 msgstr ""
 "エラー: 指定できるのは、'id'、'filename'、uuid、または 'path' のいずれか 1 つ"
 "になります。"
 
-#: ../clients/cli/connections.c:8081 ../clients/cli/connections.c:8241
+#: ../clients/cli/connections.c:8265 ../clients/cli/connections.c:8426
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:8097
+#: ../clients/cli/connections.c:8281
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています。'type' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:8100
+#: ../clients/cli/connections.c:8284
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr ""
 "警告: 既存の接続 '%s' を編集しています。'con-name' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:8127
+#: ../clients/cli/connections.c:8311
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:8129
+#: ../clients/cli/connections.c:8313
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:8164
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:8167
+#: ../clients/cli/connections.c:8352
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:8169
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:8171
+#: ../clients/cli/connections.c:8356
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:8358
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "すべての接続プロパティーを表示するには 'print' とタイプします。"
 
-#: ../clients/cli/connections.c:8175
+#: ../clients/cli/connections.c:8360
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "プロパティー詳細を表示するには、'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:8388
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8209
+#: ../clients/cli/connections.c:8394
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#: ../clients/cli/connections.c:8285
+#: ../clients/cli/connections.c:8470
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
 
-#: ../clients/cli/connections.c:8350
+#: ../clients/cli/connections.c:8536
 msgid "New connection name: "
 msgstr "新規の接続名:"
 
-#: ../clients/cli/connections.c:8352
+#: ../clients/cli/connections.c:8538
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:8357 ../clients/cli/connections.c:8837
+#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー: 不明な追加の引数: '%s'。"
 
-#: ../clients/cli/connections.c:8402
+#: ../clients/cli/connections.c:8588
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部の接続が削除されていません。"
 
-#: ../clients/cli/connections.c:8403
+#: ../clients/cli/connections.c:8589
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続の削除に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8459 ../clients/cli/connections.c:8580
+#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766
 #, c-format
 msgid "Error: %s.\n"
 msgstr "エラー: %s。\n"
 
-#: ../clients/cli/connections.c:8460 ../clients/cli/connections.c:8581
+#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767
 #, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: 一部の接続が見つかりません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8511
+#: ../clients/cli/connections.c:8697
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:8521
+#: ../clients/cli/connections.c:8707
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイルが変更されました\n"
 
-#: ../clients/cli/connections.c:8547
+#: ../clients/cli/connections.c:8733
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイルが作成されました\n"
 
-#: ../clients/cli/connections.c:8556
+#: ../clients/cli/connections.c:8742
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイルが削除されました\n"
 
-#: ../clients/cli/connections.c:8618
+#: ../clients/cli/connections.c:8804
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: 接続のリロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8651
+#: ../clients/cli/connections.c:8837
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続のロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8659
+#: ../clients/cli/connections.c:8845
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:8666
+#: ../clients/cli/connections.c:8852
 msgid "File to import: "
 msgstr "インポートするファイル:"
 
-#: ../clients/cli/connections.c:8697
+#: ../clients/cli/connections.c:8886
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数がありません。"
 
-#: ../clients/cli/connections.c:8720
+#: ../clients/cli/connections.c:8909
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8734
+#: ../clients/cli/connections.c:8923
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8736
+#: ../clients/cli/connections.c:8925
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明なパラメーター: %s"
 
-#: ../clients/cli/connections.c:8747
+#: ../clients/cli/connections.c:8936
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "エラー: 'type' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8751
+#: ../clients/cli/connections.c:8940
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8757
+#: ../clients/cli/connections.c:8946
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "エラー: %s 用の VPN プラグインが見つかりません。"
 
-#: ../clients/cli/connections.c:8764 ../clients/cli/connections.c:8856
+#: ../clients/cli/connections.c:8953 ../clients/cli/connections.c:9047
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8771
+#: ../clients/cli/connections.c:8960
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' のインポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8843
+#: ../clients/cli/connections.c:9033
 msgid "Output file name: "
 msgstr "出力ファイル名:"
 
-#: ../clients/cli/connections.c:8847
+#: ../clients/cli/connections.c:9038
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続は VPN ではありません。"
 
-#: ../clients/cli/connections.c:8869
+#: ../clients/cli/connections.c:9060
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
 
-#: ../clients/cli/connections.c:8877
+#: ../clients/cli/connections.c:9068
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8889
+#: ../clients/cli/connections.c:9080
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
@@ -2318,30 +2340,30 @@ msgstr "インターフェース: "
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266
+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235
 msgid "(none)"
 msgstr "（なし）"
 
-#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182
+#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:316
+#: ../clients/cli/devices.c:339
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<invisible> | %s"
 
-#: ../clients/cli/devices.c:317
+#: ../clients/cli/devices.c:340
 msgid "<invisible>"
 msgstr "<invisible>"
 
-#: ../clients/cli/devices.c:418
+#: ../clients/cli/devices.c:441
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:672
-#, c-format
+#: ../clients/cli/devices.c:695
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -2366,7 +2388,7 @@ msgid ""
 "\n"
 "  monitor <ifname> ...\n"
 "\n"
-"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"  wifi [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
 "[ifname <ifname>]\n"
@@ -2419,7 +2441,7 @@ msgstr ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:695
+#: ../clients/cli/devices.c:718
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2450,7 +2472,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:710
+#: ../clients/cli/devices.c:733
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2469,7 +2491,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:721
+#: ../clients/cli/devices.c:744
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2491,7 +2513,7 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:733
+#: ../clients/cli/devices.c:756
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2510,7 +2532,7 @@ msgstr ""
 "行った変更で、デバイスの更新を試行します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:767
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2550,7 +2572,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:787
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2571,7 +2593,7 @@ msgstr ""
 "それ以降の接続が自動アクティベートされることがなくなります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:776
+#: ../clients/cli/devices.c:799
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2594,7 +2616,7 @@ msgstr ""
 "コマンドで削除できません。\n"
 "\n"
 
-#: ../clients/cli/devices.c:789
+#: ../clients/cli/devices.c:812
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2617,7 +2639,7 @@ msgstr ""
 "デバイスプロパティーを変更します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:802
+#: ../clients/cli/devices.c:825
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2639,31 +2661,32 @@ msgstr ""
 "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:814
-#, c-format
+#: ../clients/cli/devices.c:837
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Perform operation on Wi-Fi devices.\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
+"auto]]\n"
 "\n"
 "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"
+"used to list APs for a particular interface, or with a specific BSSID. The\n"
+"--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 "\n"
 "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"
-"a new connection and then activates it on a device. This is a command-line\n"
-"counterpart of clicking an SSID in a GUI client. The command always creates\n"
-"a new connection and thus it is mainly useful for connecting to new Wi-Fi\n"
-"networks. If a connection for the network already exists, it is better to\n"
-"bring up the existing profile as follows: nmcli con up id <name>. Note that\n"
-"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"
+"Connect to a Wi-Fi network specified by SSID or BSSID. The command finds a\n"
+"matching connection or creates one and then activates it on a device. This\n"
+"is a command-line counterpart of clicking an SSID in a GUI client. If a\n"
+"connection for the network already exists, it is possible to bring up the\n"
+"existing profile as follows: nmcli con up id <name>. Note that only open,\n"
+"WEP and WPA-PSK networks are supported if no previous connection exists.\n"
+"It is also assumed that IP configuration is obtained via DHCP.\n"
 "\n"
 "ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
 "                     [band a|bg] [channel <channel>] [password <password>]\n"
@@ -2751,7 +2774,7 @@ msgstr ""
 "表示するためのコマンドは 'nmcli device wifi list' です。\n"
 "\n"
 
-#: ../clients/cli/devices.c:861
+#: ../clients/cli/devices.c:884
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2772,278 +2795,257 @@ msgstr ""
 "特定のインターフェースの近接デバイスを一覧表示できます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:1015
+#: ../clients/cli/devices.c:982
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:1005
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' が重複しています。\n"
 
-#: ../clients/cli/devices.c:1041
+#: ../clients/cli/devices.c:1008
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:1042
+#: ../clients/cli/devices.c:1009
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部のデバイスが見つかりません。"
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:1040
 msgid "No interface specified"
 msgstr "インターフェースが指定されていません"
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:1059
 #, c-format
 msgid "Device '%s' not found"
 msgstr "デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:1155
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:1156
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1198
+#: ../clients/cli/devices.c:1167
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:1202
+#: ../clients/cli/devices.c:1171
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:1206
+#: ../clients/cli/devices.c:1175
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:1211
+#: ../clients/cli/devices.c:1180
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:1195
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:1196
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:1197
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:1423
+#: ../clients/cli/devices.c:1392
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:1434
+#: ../clients/cli/devices.c:1403
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1732
+#: ../clients/cli/devices.c:1701
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1736
+#: ../clients/cli/devices.c:1705
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
-#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218
-#: ../clients/cli/devices.c:4100
+#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173
+#: ../clients/cli/devices.c:4144
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539
+#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/devices.c:1848
+#: ../clients/cli/devices.c:1817
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1854
+#: ../clients/cli/devices.c:1823
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1890
+#: ../clients/cli/devices.c:1862
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1893
+#: ../clients/cli/devices.c:1865
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1903
-#, c-format
-msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
-
-#: ../clients/cli/devices.c:1905
-#, c-format
-msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
-
-#: ../clients/cli/devices.c:1917
-#, c-format
-msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr ""
-"UUID '%s' の接続が、'%s' デバイス上に作成されアクティベートされました。\n"
-
-#: ../clients/cli/devices.c:1920
-#, c-format
-msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "ホットスポット '%s' が、デバイス '%s' でアクティベートされました\n"
+#: ../clients/cli/devices.c:1868
+#, fuzzy, c-format
+msgid "Error: Failed to activate connection: %s"
+msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1984
+#: ../clients/cli/devices.c:1938
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1993
+#: ../clients/cli/devices.c:1947
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr ""
 "エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
 
-#: ../clients/cli/devices.c:2008
-#, c-format
-msgid "Device '%s' has been connected.\n"
-msgstr "デバイス '%s'  は接続されています。\n"
-
-#: ../clients/cli/devices.c:2049
+#: ../clients/cli/devices.c:2000
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136
-#: ../clients/cli/devices.c:2366
+#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088
+#: ../clients/cli/devices.c:2325
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:2124
+#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s"
 
-#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262
+#: ../clients/cli/devices.c:2148 ../clients/cli/devices.c:2217
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
 
-#: ../clients/cli/devices.c:2287
+#: ../clients/cli/devices.c:2242
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "エラー: デバイス '%s' (%s) からの適用済み接続の読み取りに失敗しました: %s"
 
-#: ../clients/cli/devices.c:2351
+#: ../clients/cli/devices.c:2309
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部のデバイスが切断されませんでした。"
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2310
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2430
+#: ../clients/cli/devices.c:2390
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部のデバイスが削除されませんでした。"
 
-#: ../clients/cli/devices.c:2431
+#: ../clients/cli/devices.c:2391
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2515
+#: ../clients/cli/devices.c:2473
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティーが指定されていません。"
 
-#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547
-#: ../clients/cli/general.c:713 ../clients/cli/general.c:725
+#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505
+#: ../clients/cli/general.c:691 ../clients/cli/general.c:703
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2536
+#: ../clients/cli/devices.c:2494
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2553
+#: ../clients/cli/devices.c:2511
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "エラー: '自動接続': %s。"
 
-#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739
+#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' が不明です。"
 
-#: ../clients/cli/devices.c:2610
+#: ../clients/cli/devices.c:2568
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2636
+#: ../clients/cli/devices.c:2594
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デバイスが作成されました\n"
 
-#: ../clients/cli/devices.c:2643
+#: ../clients/cli/devices.c:2601
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デバイスが削除されました\n"
 
-#: ../clients/cli/devices.c:2818
+#: ../clients/cli/devices.c:2781
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2895
+#: ../clients/cli/devices.c:2868
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:3085
+#: ../clients/cli/devices.c:3024
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:3103
+#: ../clients/cli/devices.c:3042
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr ""
 "エラー: 無効な再スキャン引数です: '%s' は [auto、no、yes] にはありません"
 
-#: ../clients/cli/devices.c:3110
+#: ../clients/cli/devices.c:3049
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:3120
+#: ../clients/cli/devices.c:3060
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3052,27 +3054,27 @@ msgstr ""
 "エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
 "NetworkManager Wi-Fi プラグインを確認してください。"
 
-#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342
-#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938
+#: ../clients/cli/devices.c:3064 ../clients/cli/devices.c:3324
+#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:3191
+#: ../clients/cli/devices.c:3173
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:3196
+#: ../clients/cli/devices.c:3178
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:3215
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は、有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:3245
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3080,120 +3082,125 @@ msgstr ""
 "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
 "てください。"
 
-#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3290
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:3325
+#: ../clients/cli/devices.c:3307
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "エラー: (%s) が接続先となる BSSID は、bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:3331
+#: ../clients/cli/devices.c:3313
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は、SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781
-#: ../clients/cli/devices.c:3940
+#: ../clients/cli/devices.c:3326 ../clients/cli/devices.c:3825
+#: ../clients/cli/devices.c:3984
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3364
+#: ../clients/cli/devices.c:3346
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
 
-#: ../clients/cli/devices.c:3391
+#: ../clients/cli/devices.c:3373
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3393
+#: ../clients/cli/devices.c:3375
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3435
+#: ../clients/cli/devices.c:3403
+#, c-format
+msgid "Error: Connection '%s' exists but properties don't match."
+msgstr ""
+
+#: ../clients/cli/devices.c:3446
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 "警告: '%s' は、非表示 AP の SSID である必要がありますが、BSSID のようです。\n"
 
-#: ../clients/cli/devices.c:3451
+#: ../clients/cli/devices.c:3482
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3600
+#: ../clients/cli/devices.c:3644
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' は有効な WPA PSK ではありません"
 
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3661
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要"
 "があります)"
 
-#: ../clients/cli/devices.c:3633
+#: ../clients/cli/devices.c:3677
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットスポットのパスワード: %s\n"
 
-#: ../clients/cli/devices.c:3704
+#: ../clients/cli/devices.c:3748
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid が長すぎます。"
 
-#: ../clients/cli/devices.c:3718
+#: ../clients/cli/devices.c:3762
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
 
-#: ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3787
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3763
+#: ../clients/cli/devices.c:3807
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: チャネルにはバンドも必要です。"
 
-#: ../clients/cli/devices.c:3768
+#: ../clients/cli/devices.c:3812
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: チャンネル '%s' は、バンド '%s' に対して有効ではありません。"
 
-#: ../clients/cli/devices.c:3792
+#: ../clients/cli/devices.c:3836
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "エラー: デバイス '%s' は、AP またはアドホックモードのいずれもサポートしませ"
 "ん。"
 
-#: ../clients/cli/devices.c:3826
+#: ../clients/cli/devices.c:3870
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効なパスワード: %s。"
 
-#: ../clients/cli/devices.c:3901
+#: ../clients/cli/devices.c:3945
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返すことはできません。"
 
 #. Main header name
-#: ../clients/cli/devices.c:4006
+#: ../clients/cli/devices.c:4050
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デバイス"
 
-#: ../clients/cli/devices.c:4116
+#: ../clients/cli/devices.c:4160
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
@@ -3226,47 +3233,31 @@ msgstr "切断中"
 msgid "disconnected"
 msgstr "切断済み"
 
-#: ../clients/cli/general.c:83
-msgid "none"
-msgstr "なし"
-
-#: ../clients/cli/general.c:84
-msgid "portal"
-msgstr "ポータル"
-
-#: ../clients/cli/general.c:85
-msgid "limited"
-msgstr "制限付き"
-
-#: ../clients/cli/general.c:86
-msgid "full"
-msgstr "完全"
-
-#: ../clients/cli/general.c:158
+#: ../clients/cli/general.c:137
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:165
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:179
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:179
 msgid "started"
 msgstr "起動しました"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:213
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:213
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:331
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3295,7 +3286,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:342
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3312,7 +3303,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:351
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3335,7 +3326,7 @@ msgstr ""
 "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:363
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3348,7 +3339,7 @@ msgstr ""
 "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
 "\n"
 
-#: ../clients/cli/general.c:392
+#: ../clients/cli/general.c:371
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3374,7 +3365,7 @@ msgstr ""
 "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
 "\n"
 
-#: ../clients/cli/general.c:405
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3399,7 +3390,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:415
+#: ../clients/cli/general.c:394
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3412,7 +3403,7 @@ msgstr ""
 "ネットワークをオンに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:402
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3425,7 +3416,7 @@ msgstr ""
 "ネットワークをオフに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:410
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3444,7 +3435,7 @@ msgstr ""
 "ネットワークの接続状態を取得します。\n"
 "オプションの 'check' 引数を付けると接続を再チェックします。\n"
 
-#: ../clients/cli/general.c:443
+#: ../clients/cli/general.c:422
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3461,7 +3452,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3478,7 +3469,7 @@ msgstr ""
 "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3495,7 +3486,7 @@ msgstr ""
 "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:472
+#: ../clients/cli/general.c:451
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3513,7 +3504,7 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/general.c:482
+#: ../clients/cli/general.c:461
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3528,180 +3519,180 @@ msgstr ""
 "NetworkManager で変更が行われるたびに行を出力します。\n"
 "\n"
 
-#: ../clients/cli/general.c:512
+#: ../clients/cli/general.c:491
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:516
+#: ../clients/cli/general.c:495
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 使用できるのは次のフィールドのみです: %s"
 
-#: ../clients/cli/general.c:570
+#: ../clients/cli/general.c:548
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:574
+#: ../clients/cli/general.c:552
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:663
+#: ../clients/cli/general.c:641
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:667
+#: ../clients/cli/general.c:645
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:749
+#: ../clients/cli/general.c:727
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギングの設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:766
+#: ../clients/cli/general.c:744
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:835
+#: ../clients/cli/general.c:813
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "エラー: '--fields' の値 '%s' はここでは無効です (使用できるフィールド: %s)"
 
-#: ../clients/cli/general.c:860
+#: ../clients/cli/general.c:838
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:908 ../clients/cli/general.c:920
+#: ../clients/cli/general.c:886 ../clients/cli/general.c:898
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:923
+#: ../clients/cli/general.c:901
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr ""
 "エラー: 'networking' のコマンド '%s' は、有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:937
+#: ../clients/cli/general.c:915
 msgid "Networking"
 msgstr "ネットワーキング"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:972
+#: ../clients/cli/general.c:950
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
-#. no argument, show current WiFi state
-#: ../clients/cli/general.c:1002
+#. no argument, show current Wi-Fi state
+#: ../clients/cli/general.c:980
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1029
+#: ../clients/cli/general.c:1007
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1055
 msgid "NetworkManager has started"
 msgstr "NetworkManager  が起動されました"
 
-#: ../clients/cli/general.c:1077
+#: ../clients/cli/general.c:1055
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager が停止しました"
 
-#: ../clients/cli/general.c:1088
+#: ../clients/cli/general.c:1066
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト名が '%s' に設定されました\n"
 
-#: ../clients/cli/general.c:1103
+#: ../clients/cli/general.c:1081
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' はプライマリー接続です\n"
 
-#: ../clients/cli/general.c:1105
+#: ../clients/cli/general.c:1083
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続がありません\n"
 
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1095
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性は '%s' です\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1109
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager の状態は '%s' です\n"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1129
 msgid "connection available"
 msgstr "接続が利用可能"
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1131
 msgid "connections available"
 msgstr "接続が利用可能"
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1149
 msgid "autoconnect"
 msgstr "自動接続"
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1151
 msgid "fw missing"
 msgstr "fw がありません"
 
-#: ../clients/cli/general.c:1177
+#: ../clients/cli/general.c:1156
 msgid "plugin missing"
 msgstr "プラグインがありません"
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1161
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1184
+#: ../clients/cli/general.c:1163
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1189
+#: ../clients/cli/general.c:1168
 msgid "iface"
 msgstr "iface"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1171
 msgid "port"
 msgstr "ポート"
 
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1174
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1212
+#: ../clients/cli/general.c:1191
 msgid "master"
 msgstr "マスター"
 
-#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239
 #: ../clients/tui/nmt-connect-connection-list.c:407
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1197
 msgid "ip4 default"
 msgstr "ip4 デフォルト"
 
-#: ../clients/cli/general.c:1220
+#: ../clients/cli/general.c:1199
 msgid "ip6 default"
 msgstr "ip6 デフォルト"
 
-#: ../clients/cli/general.c:1303
+#: ../clients/cli/general.c:1281
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 接続"
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1349
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3719,39 +3710,36 @@ msgstr ""
 "使用方法の詳細情報については、nmcli(1) と nmcli-examples(5) の man ページを参"
 "照してください。\n"
 
-#: ../clients/cli/general.c:1392
+#: ../clients/cli/general.c:1370
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
 
-#: ../clients/cli/general.c:1404
+#: ../clients/cli/general.c:1382
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager が実行されていません (待機中)\n"
 
 #: ../clients/cli/nmcli.c:245
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
-"  -o[verview]                                    overview mode (hide default "
-"values)\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"
-"  -f[ields] <field1,field2,...>|all|common       specify fields to output\n"
-"  -g[et-values] <field1,field2,...>|all|common   shortcut for -m tabular -t -"
-"f\n"
-"  -e[scape] yes|no                               escape columns separators "
-"in values\n"
-"  -a[sk]                                         ask for missing parameters\n"
-"  -s[how-secrets]                                allow displaying passwords\n"
-"  -w[ait] <seconds>                              set timeout waiting for "
-"finishing operations\n"
-"  -v[ersion]                                     show program version\n"
-"  -h[elp]                                        print this help\n"
+"  -a, --ask                                ask for missing parameters\n"
+"  -c, --colors auto|yes|no                 whether to use colors in output\n"
+"  -e, --escape yes|no                      escape columns separators in "
+"values\n"
+"  -f, --fields <field,...>|all|common      specify fields to output\n"
+"  -g, --get-values <field,...>|all|common  shortcut for -m tabular -t -f\n"
+"  -h, --help                               print this help\n"
+"  -m, --mode tabular|multiline             output mode\n"
+"  -o, --overview                           overview mode\n"
+"  -p, --pretty                             pretty output\n"
+"  -s, --show-secrets                       allow displaying passwords\n"
+"  -t, --terse                              terse output\n"
+"  -v, --version                            how program version\n"
+"  -w, --wait <seconds>                     set timeout waiting for finishing "
+"operations\n"
 "\n"
 "OBJECT\n"
 "  g[eneral]       NetworkManager's general status and operations\n"
@@ -3870,21 +3858,21 @@ msgstr "エラー: オプション '%s' は不明です。'nmcli -help' で確
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "エラー: nmcli がシグナル %s (%d) で終了しました"
 
-#: ../clients/cli/nmcli.c:1052
+#: ../clients/cli/nmcli.c:1060
 msgid "Success"
 msgstr "成功"
 
-#: ../clients/cli/polkit-agent.c:68
+#: ../clients/cli/polkit-agent.c:69
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "認証メッセージ: %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:77
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "認証エラー: %s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:137
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
@@ -3917,112 +3905,112 @@ msgstr ""
 msgid "Do you want to remove them? [yes] "
 msgstr "削除しますか? [yes] "
 
-#: ../clients/cli/settings.c:332
+#: ../clients/cli/settings.c:333
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
 
-#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
+#: ../clients/cli/settings.c:338 ../clients/cli/settings.c:351
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "'%s' は VPN 接続プロファイルではありません"
 
-#: ../clients/cli/settings.c:344
+#: ../clients/cli/settings.c:345
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' は既存のプロファイルの名前ではありません"
 
-#: ../clients/cli/settings.c:388
+#: ../clients/cli/settings.c:389
 #, c-format
 msgid "Warning: %s\n"
 msgstr "警告: %s\n"
 
-#: ../clients/cli/settings.c:391
+#: ../clients/cli/settings.c:392
 #, c-format
 msgid "Info: %s\n"
 msgstr "情報: %s\n"
 
-#: ../clients/cli/settings.c:484
+#: ../clients/cli/settings.c:485
 msgid "don't know how to get the property value"
 msgstr "プロパティー値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
+#: ../clients/cli/settings.c:575 ../clients/cli/settings.c:617
 msgid "the property can't be changed"
 msgstr "このプロパティーは変更できません"
 
-#: ../clients/cli/settings.c:730
+#: ../clients/cli/settings.c:731
 msgid "[NM property description]"
 msgstr "[NM プロパティーの詳細]"
 
-#: ../clients/cli/settings.c:740
+#: ../clients/cli/settings.c:741
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
-#: ../clients/cli/utils.c:319
+#: ../clients/cli/utils.c:320
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "エラー: 引数 '%s' が必要ですが、'%s' が指定されました。"
 
-#: ../clients/cli/utils.c:322
+#: ../clients/cli/utils.c:323
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/utils.c:709
+#: ../clients/cli/utils.c:710
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "無効なフィールド '%s%s%s'。そのようなフィールドはありません"
 
-#: ../clients/cli/utils.c:713
+#: ../clients/cli/utils.c:714
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "無効なフィールド '%s%s%s'。使用できるフィールド: [%s]"
 
-#: ../clients/cli/utils.c:809
+#: ../clients/cli/utils.c:810
 #, c-format
 msgid "failure to select field"
 msgstr "フィールドの選択に失敗しました"
 
-#: ../clients/cli/utils.c:1435
+#: ../clients/cli/utils.c:1438
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "nmcli 出力の読み込み中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/utils.c:1440
+#: ../clients/cli/utils.c:1443
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "nmcli 出力の書き込み中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1467
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "ページャーパイプの作成に失敗しました: %s\n"
 
-#: ../clients/cli/utils.c:1472
+#: ../clients/cli/utils.c:1475
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "ページャーのフォークに失敗しました: %s\n"
 
-#: ../clients/cli/utils.c:1518 ../clients/cli/utils.c:1520
+#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "ページャーパイプの複製に失敗しました: %s\n"
 
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4908
+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4949
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4910
+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/utils.h:324
+#: ../clients/cli/utils.h:328
 #, c-format
 msgid "%lld (%s)"
 msgstr "%lld (%s)"
 
-#: ../clients/cli/utils.h:331
-#, fuzzy, c-format
+#: ../clients/cli/utils.h:335
+#, c-format
 msgid "%lld - %s"
 msgstr "%lld - %s"
 
@@ -4103,7 +4091,7 @@ msgstr "いいえ (推測)"
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
 #: ../clients/common/nm-client-utils.c:287
 #: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1363
+#: ../libnm/nm-device.c:1437
 msgid "Unknown"
 msgstr "不明"
 
@@ -4358,8 +4346,9 @@ msgid "The device parent's management changed"
 msgstr "デバイスの親の管理が変更されました"
 
 #: ../clients/common/nm-client-utils.c:351
-msgid "OpenVSwitch database connection failed"
-msgstr "OpenVSwitch データベースの接続に失敗しました"
+#, fuzzy
+msgid "Open vSwitch database connection failed"
+msgstr "Open vSwitch データベースの接続に失敗しました"
 
 #: ../clients/common/nm-client-utils.c:352
 msgid "A duplicate IP address was detected"
@@ -4481,219 +4470,220 @@ msgstr "無効なルート: %s. %s"
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
 
-#: ../clients/common/nm-meta-setting-desc.c:438
+#: ../clients/common/nm-meta-setting-desc.c:446
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "無効な優先度マップ '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:445
-#: ../clients/common/nm-meta-setting-desc.c:451
+#: ../clients/common/nm-meta-setting-desc.c:453
+#: ../clients/common/nm-meta-setting-desc.c:459
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:503
+#: ../clients/common/nm-meta-setting-desc.c:511
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "ファイル '%s' から pac-script を読み込めません"
 
-#: ../clients/common/nm-meta-setting-desc.c:510
+#: ../clients/common/nm-meta-setting-desc.c:518
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "ファイル '%s' には無効な utf-8 が含まれています"
 
-#: ../clients/common/nm-meta-setting-desc.c:523
+#: ../clients/common/nm-meta-setting-desc.c:531
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "'%s' には有効な PAC スクリプトが含まれていません"
 
-#: ../clients/common/nm-meta-setting-desc.c:526
+#: ../clients/common/nm-meta-setting-desc.c:534
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "有効な PAC スクリプトではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:580
+#: ../clients/common/nm-meta-setting-desc.c:588
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "ファイル '%s' からチーム設定を読み込めません"
 
-#: ../clients/common/nm-meta-setting-desc.c:587
+#: ../clients/common/nm-meta-setting-desc.c:595
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "チーム設定ファイル '%s' には無効な utf-8 が含まれています"
 
-#: ../clients/common/nm-meta-setting-desc.c:599
+#: ../clients/common/nm-meta-setting-desc.c:607
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr "'%s' には有効なチーム設定が含まれていません"
 
-#: ../clients/common/nm-meta-setting-desc.c:602
+#: ../clients/common/nm-meta-setting-desc.c:610
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr "チーム設定は JSON オブジェクトである必要があります"
 
-#: ../clients/common/nm-meta-setting-desc.c:723
+#: ../clients/common/nm-meta-setting-desc.c:731
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: ../clients/common/nm-meta-setting-desc.c:864
+#: ../clients/common/nm-meta-setting-desc.c:885
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/common/nm-meta-setting-desc.c:1016
+#: ../clients/common/nm-meta-setting-desc.c:1037
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1140
-#, c-format
-msgid "'%s' is out of range [%lli, %lli]"
-msgstr "'%s' は、[%lli, %lli] の範囲外です"
+#: ../clients/common/nm-meta-setting-desc.c:1180
+#: ../clients/common/nm-meta-setting-desc.c:1184
+#, fuzzy
+msgid "'%s' is out of range [%"
+msgstr "'%s' は、[0, %u] の範囲外です"
 
-#: ../clients/common/nm-meta-setting-desc.c:1146
+#: ../clients/common/nm-meta-setting-desc.c:1189
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "'%s' は有効な数値ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1196
+#: ../clients/common/nm-meta-setting-desc.c:1243
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "'%s' は、[0, %u] の範囲外です"
 
-#: ../clients/common/nm-meta-setting-desc.c:1239
+#: ../clients/common/nm-meta-setting-desc.c:1286
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1343
+#: ../clients/common/nm-meta-setting-desc.c:1391
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "無効なオプション '%s' です。[%s] の組み合わせを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1348 ../libnm-core/nm-keyfile.c:771
+#: ../clients/common/nm-meta-setting-desc.c:1396 ../libnm-core/nm-keyfile.c:780
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1467
+#: ../clients/common/nm-meta-setting-desc.c:1515
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1469
+#: ../clients/common/nm-meta-setting-desc.c:1517
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1472
+#: ../clients/common/nm-meta-setting-desc.c:1520
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1504
+#: ../clients/common/nm-meta-setting-desc.c:1552
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1510
+#: ../clients/common/nm-meta-setting-desc.c:1558
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1512
+#: ../clients/common/nm-meta-setting-desc.c:1560
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1514
+#: ../clients/common/nm-meta-setting-desc.c:1562
 msgid "LOOSE_BINDING, "
 msgstr "ルースバインディング、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1516
+#: ../clients/common/nm-meta-setting-desc.c:1564
 msgid "MVRP, "
 msgstr "MVRP、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1556
+#: ../clients/common/nm-meta-setting-desc.c:1604
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1562
+#: ../clients/common/nm-meta-setting-desc.c:1610
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1564
+#: ../clients/common/nm-meta-setting-desc.c:1612
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1566
+#: ../clients/common/nm-meta-setting-desc.c:1614
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1631
+#: ../clients/common/nm-meta-setting-desc.c:1679
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1670
+#: ../clients/common/nm-meta-setting-desc.c:1718
 msgid "no item to remove"
 msgstr "削除するアイテムがありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1674
+#: ../clients/common/nm-meta-setting-desc.c:1722
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "インデックス '%d' は範囲内にありません <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1689
+#: ../clients/common/nm-meta-setting-desc.c:1737
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無効なオプション '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:1691
+#: ../clients/common/nm-meta-setting-desc.c:1739
 msgid "missing option"
 msgstr "足りないオプション"
 
-#: ../clients/common/nm-meta-setting-desc.c:1715
+#: ../clients/common/nm-meta-setting-desc.c:1763
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' は有効な MAC ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1742
-#: ../clients/common/nm-meta-setting-desc.c:1839
-#: ../clients/common/nm-meta-setting-desc.c:4814
+#: ../clients/common/nm-meta-setting-desc.c:1790
+#: ../clients/common/nm-meta-setting-desc.c:1887
+#: ../clients/common/nm-meta-setting-desc.c:4855 ../src/nm-config.c:547
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../clients/common/nm-meta-setting-desc.c:1783
+#: ../clients/common/nm-meta-setting-desc.c:1831
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1819
+#: ../clients/common/nm-meta-setting-desc.c:1867
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1938
+#: ../clients/common/nm-meta-setting-desc.c:1985
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2227
+#: ../clients/common/nm-meta-setting-desc.c:2268
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "プロパティーには EAP メソッド '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2250
+#: ../clients/common/nm-meta-setting-desc.c:2291
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2276
+#: ../clients/common/nm-meta-setting-desc.c:2317
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2398
+#: ../clients/common/nm-meta-setting-desc.c:2439
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4731,221 +4721,221 @@ msgstr ""
 #. * 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/common/nm-meta-setting-desc.c:2461
+#: ../clients/common/nm-meta-setting-desc.c:2502
 #, c-format
 msgid "Can not change the connection type"
 msgstr "接続タイプを変更できません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2564
+#: ../clients/common/nm-meta-setting-desc.c:2605
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "プロパティーにはパーミッション '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2585
+#: ../clients/common/nm-meta-setting-desc.c:2626
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してくださ"
 "い。"
 
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:2723
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "値 '%s' は有効な UUID ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2689
+#: ../clients/common/nm-meta-setting-desc.c:2730
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "プロパティーには UUID '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2758
+#: ../clients/common/nm-meta-setting-desc.c:2799
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2764
+#: ../clients/common/nm-meta-setting-desc.c:2805
 msgid "enabled, "
 msgstr "有効、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2766
+#: ../clients/common/nm-meta-setting-desc.c:2807
 msgid "advertise, "
 msgstr "公表、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2768
+#: ../clients/common/nm-meta-setting-desc.c:2809
 msgid "willing, "
 msgstr "用意がある、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2890
+#: ../clients/common/nm-meta-setting-desc.c:2931
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' は有効な DCB フラグではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2919
+#: ../clients/common/nm-meta-setting-desc.c:2960
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマで区切った 8 つの番号を含ませてください"
 
-#: ../clients/common/nm-meta-setting-desc.c:2935
+#: ../clients/common/nm-meta-setting-desc.c:2976
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2938
+#: ../clients/common/nm-meta-setting-desc.c:2979
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2959
+#: ../clients/common/nm-meta-setting-desc.c:3000
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "変更は、'%s' に 1 (有効) が含まれるまで効果はありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3014
+#: ../clients/common/nm-meta-setting-desc.c:3055
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3087
-#: ../clients/common/nm-meta-setting-desc.c:3093
+#: ../clients/common/nm-meta-setting-desc.c:3128
+#: ../clients/common/nm-meta-setting-desc.c:3134
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 "SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があり"
 "ます"
 
-#: ../clients/common/nm-meta-setting-desc.c:3117
+#: ../clients/common/nm-meta-setting-desc.c:3158
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3140
+#: ../clients/common/nm-meta-setting-desc.c:3181
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/common/nm-meta-setting-desc.c:3279
-#: ../clients/common/nm-meta-setting-desc.c:3296
+#: ../clients/common/nm-meta-setting-desc.c:3320
+#: ../clients/common/nm-meta-setting-desc.c:3337
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3302
-#: ../clients/common/nm-meta-setting-desc.c:3546
+#: ../clients/common/nm-meta-setting-desc.c:3343
+#: ../clients/common/nm-meta-setting-desc.c:3587
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "プロパティーには DNS サーバー '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3340
-#: ../clients/common/nm-meta-setting-desc.c:3584
+#: ../clients/common/nm-meta-setting-desc.c:3381
+#: ../clients/common/nm-meta-setting-desc.c:3625
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3377
-#: ../clients/common/nm-meta-setting-desc.c:3621
+#: ../clients/common/nm-meta-setting-desc.c:3418
+#: ../clients/common/nm-meta-setting-desc.c:3662
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "プロパティーには DNS オプション '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3420
-#: ../clients/common/nm-meta-setting-desc.c:3670
+#: ../clients/common/nm-meta-setting-desc.c:3461
+#: ../clients/common/nm-meta-setting-desc.c:3711
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "プロパティーには IP アドレス '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3440
-#: ../clients/common/nm-meta-setting-desc.c:3689
+#: ../clients/common/nm-meta-setting-desc.c:3481
+#: ../clients/common/nm-meta-setting-desc.c:3730
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効なゲートウェイアドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3479
-#: ../clients/common/nm-meta-setting-desc.c:3730
+#: ../clients/common/nm-meta-setting-desc.c:3520
+#: ../clients/common/nm-meta-setting-desc.c:3771
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "プロパティーにはルート '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3523
-#: ../clients/common/nm-meta-setting-desc.c:3540
+#: ../clients/common/nm-meta-setting-desc.c:3564
+#: ../clients/common/nm-meta-setting-desc.c:3581
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3792
+#: ../clients/common/nm-meta-setting-desc.c:3833
 #, c-format
 msgid "the property doesn't contain interface name '%s'"
 msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3829
+#: ../clients/common/nm-meta-setting-desc.c:3870
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません。<1-13> を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:3921
+#: ../clients/common/nm-meta-setting-desc.c:3962
 msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
 msgstr ""
 "有効な構文は以下のようになります: vf [attribute=value]... [,vf "
 "[attribute=value]...]"
 
-#: ../clients/common/nm-meta-setting-desc.c:3943
+#: ../clients/common/nm-meta-setting-desc.c:3984
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3967
+#: ../clients/common/nm-meta-setting-desc.c:4008
 #, c-format
 msgid "the property doesn't contain vf with index %u"
 msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3994
+#: ../clients/common/nm-meta-setting-desc.c:4035
 #, c-format
 msgid "the property doesn't contain qdisc '%s'"
 msgstr "プロパティーには qdisc '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4048
+#: ../clients/common/nm-meta-setting-desc.c:4089
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4071
+#: ../clients/common/nm-meta-setting-desc.c:4112
 #, c-format
 msgid "the property doesn't contain tfilter '%s'"
 msgstr "プロパティーには tfilter '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4138
+#: ../clients/common/nm-meta-setting-desc.c:4179
 #, c-format
 msgid "the property doesn't contain string '%s'"
 msgstr "プロパティーには文字列 '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4213
-#: ../clients/common/nm-meta-setting-desc.c:4287
+#: ../clients/common/nm-meta-setting-desc.c:4254
+#: ../clients/common/nm-meta-setting-desc.c:4328
 #, c-format
 msgid "the property doesn't contain link watcher '%s'"
 msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4393
+#: ../clients/common/nm-meta-setting-desc.c:4434
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr ""
 "マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4401
+#: ../clients/common/nm-meta-setting-desc.c:4442
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "プロパティーにはマッピング '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4409
+#: ../clients/common/nm-meta-setting-desc.c:4450
 msgid "no priority to remove"
 msgstr "削除する優先度がありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4413
+#: ../clients/common/nm-meta-setting-desc.c:4454
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4482
+#: ../clients/common/nm-meta-setting-desc.c:4523
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "'%s' を空白にすることはできません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4521
-#: ../clients/common/nm-meta-setting-desc.c:4652
+#: ../clients/common/nm-meta-setting-desc.c:4562
+#: ../clients/common/nm-meta-setting-desc.c:4693
 #: ../libnm-core/nm-setting-sriov.c:446 ../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:645
@@ -4955,23 +4945,23 @@ msgstr "'%s' を空白にすることはできません"
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' は有効な MAC アドレスではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4527
-#: ../clients/common/nm-meta-setting-desc.c:4658
+#: ../clients/common/nm-meta-setting-desc.c:4568
+#: ../clients/common/nm-meta-setting-desc.c:4699
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "プロパティーには MAC アドレス '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4545
+#: ../clients/common/nm-meta-setting-desc.c:4586
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' は無効です。2  文字または 3 文字の文字列を入力してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:4559
+#: ../clients/common/nm-meta-setting-desc.c:4600
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
 
-#: ../clients/common/nm-meta-setting-desc.c:4591
+#: ../clients/common/nm-meta-setting-desc.c:4632
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4982,24 +4972,24 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4625
+#: ../clients/common/nm-meta-setting-desc.c:4666
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4631
+#: ../clients/common/nm-meta-setting-desc.c:4672
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4714
-#: ../clients/common/nm-meta-setting-desc.c:4750
-#: ../clients/common/nm-meta-setting-desc.c:4786
+#: ../clients/common/nm-meta-setting-desc.c:4755
+#: ../clients/common/nm-meta-setting-desc.c:4791
+#: ../clients/common/nm-meta-setting-desc.c:4827
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "プロパティーにはプロトコル '%s' が含まれません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4823
+#: ../clients/common/nm-meta-setting-desc.c:4864
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -5008,62 +4998,62 @@ msgstr ""
 "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
 "定してください。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4833
+#: ../clients/common/nm-meta-setting-desc.c:4874
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "WEP キーは '%s' であると仮定しています"
 
-#: ../clients/common/nm-meta-setting-desc.c:4838
+#: ../clients/common/nm-meta-setting-desc.c:4879
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP キーインデックスは '%d' に設定されます"
 
-#: ../clients/common/nm-meta-setting-desc.c:4877
+#: ../clients/common/nm-meta-setting-desc.c:4918
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr ""
 "'%s' は '%s' タイプと互換性がありません。キーを変更するか、削除してください。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4928
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4939
+#: ../clients/common/nm-meta-setting-desc.c:4980
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "'%s' は無効です; 'on'、'off'、または 'ignore' を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:4998
+#: ../clients/common/nm-meta-setting-desc.c:5039
 msgid "Bonding primary interface [none]"
 msgstr "ボンドのプライマリインターフェース [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:5005
+#: ../clients/common/nm-meta-setting-desc.c:5046
 msgid "Bonding monitoring mode"
 msgstr "ボンディングモニタリングモード"
 
-#: ../clients/common/nm-meta-setting-desc.c:5014
+#: ../clients/common/nm-meta-setting-desc.c:5055
 msgid "Bonding miimon [100]"
 msgstr "ボンドの miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5022
+#: ../clients/common/nm-meta-setting-desc.c:5063
 msgid "Bonding downdelay [0]"
 msgstr "ボンドの downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5030
+#: ../clients/common/nm-meta-setting-desc.c:5071
 msgid "Bonding updelay [0]"
 msgstr "ボンドの updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5038
+#: ../clients/common/nm-meta-setting-desc.c:5079
 msgid "Bonding arp-interval [0]"
 msgstr "ボンドの arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5046
+#: ../clients/common/nm-meta-setting-desc.c:5087
 msgid "Bonding arp-ip-target [none]"
 msgstr "ボンドの arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5054
+#: ../clients/common/nm-meta-setting-desc.c:5095
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('slow' または 'fast') [slow]"
 
@@ -5071,7 +5061,7 @@ msgstr "LACP レート ('slow' または 'fast') [slow]"
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:5173
+#: ../clients/common/nm-meta-setting-desc.c:5212
 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 "
@@ -5089,7 +5079,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5181
+#: ../clients/common/nm-meta-setting-desc.c:5220
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5138,7 +5128,7 @@ msgstr ""
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5231
+#: ../clients/common/nm-meta-setting-desc.c:5270
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5152,7 +5142,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5265
+#: ../clients/common/nm-meta-setting-desc.c:5304
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5166,7 +5156,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5322
+#: ../clients/common/nm-meta-setting-desc.c:5361
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5183,7 +5173,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5357
+#: ../clients/common/nm-meta-setting-desc.c:5396
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5200,7 +5190,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5384
+#: ../clients/common/nm-meta-setting-desc.c:5423
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5221,8 +5211,8 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5401
-#: ../clients/common/nm-meta-setting-desc.c:5419
+#: ../clients/common/nm-meta-setting-desc.c:5440
+#: ../clients/common/nm-meta-setting-desc.c:5458
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5236,84 +5226,84 @@ msgstr ""
 "してください。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5458
-#: ../clients/common/nm-secret-agent-simple.c:249
-#: ../clients/common/nm-secret-agent-simple.c:347
+#: ../clients/common/nm-meta-setting-desc.c:5497
+#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:363
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../clients/common/nm-meta-setting-desc.c:5464
-#: ../clients/common/nm-meta-setting-desc.c:5648
-#: ../clients/common/nm-meta-setting-desc.c:6021
-#: ../clients/common/nm-meta-setting-desc.c:6681
+#: ../clients/common/nm-meta-setting-desc.c:5503
+#: ../clients/common/nm-meta-setting-desc.c:5687
+#: ../clients/common/nm-meta-setting-desc.c:6060
+#: ../clients/common/nm-meta-setting-desc.c:6720
 msgid "Password [none]"
 msgstr "パスワード [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5510
+#: ../clients/common/nm-meta-setting-desc.c:5549
 msgid "Bluetooth device address"
 msgstr "Bluetooth デバイスアドレス"
 
-#: ../clients/common/nm-meta-setting-desc.c:5555
-#: ../clients/common/nm-meta-setting-desc.c:6075
-#: ../clients/common/nm-meta-setting-desc.c:7408
+#: ../clients/common/nm-meta-setting-desc.c:5594
+#: ../clients/common/nm-meta-setting-desc.c:6114
 #: ../clients/common/nm-meta-setting-desc.c:7446
-#: ../clients/common/nm-meta-setting-desc.c:7583
-#: ../clients/common/nm-meta-setting-desc.c:7801
+#: ../clients/common/nm-meta-setting-desc.c:7484
+#: ../clients/common/nm-meta-setting-desc.c:7621
+#: ../clients/common/nm-meta-setting-desc.c:7839
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5561
+#: ../clients/common/nm-meta-setting-desc.c:5600
 msgid "Enable STP [no]"
 msgstr "STP の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5567
+#: ../clients/common/nm-meta-setting-desc.c:5606
 msgid "STP priority [32768]"
 msgstr "STP の優先度 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5573
+#: ../clients/common/nm-meta-setting-desc.c:5612
 msgid "Forward delay [15]"
 msgstr "フォワード遅延 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5579
+#: ../clients/common/nm-meta-setting-desc.c:5618
 msgid "Hello time [2]"
 msgstr "Hello タイム [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5585
+#: ../clients/common/nm-meta-setting-desc.c:5624
 msgid "Max age [20]"
 msgstr "最大エイジ [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5591
+#: ../clients/common/nm-meta-setting-desc.c:5630
 msgid "MAC address ageing time [300]"
 msgstr "MAC アドレスのエージングタイム [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5597
+#: ../clients/common/nm-meta-setting-desc.c:5636
 msgid "Group forward mask [0]"
 msgstr "グループの前方マスク [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5603
+#: ../clients/common/nm-meta-setting-desc.c:5642
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP スヌーピングの有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5615
+#: ../clients/common/nm-meta-setting-desc.c:5654
 msgid "Bridge port priority [32]"
 msgstr "ブリッジポートの優先度 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5621
+#: ../clients/common/nm-meta-setting-desc.c:5660
 msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジポートの STP パスコスト [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5627
+#: ../clients/common/nm-meta-setting-desc.c:5666
 msgid "Hairpin [no]"
 msgstr "ヘアピン [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5642
-#: ../clients/common/nm-meta-setting-desc.c:6015
-#: ../clients/common/nm-meta-setting-desc.c:7298
+#: ../clients/common/nm-meta-setting-desc.c:5681
+#: ../clients/common/nm-meta-setting-desc.c:6054
+#: ../clients/common/nm-meta-setting-desc.c:7336
 msgid "Username [none]"
 msgstr "ユーザー名 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5745
+#: ../clients/common/nm-meta-setting-desc.c:5784
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5328,7 +5318,7 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5787
+#: ../clients/common/nm-meta-setting-desc.c:5826
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5350,7 +5340,7 @@ msgstr ""
 "\n"
 "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5804
+#: ../clients/common/nm-meta-setting-desc.c:5843
 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"
@@ -5365,25 +5355,25 @@ msgstr ""
 "NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
 "'unknown'\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6032
+#: ../clients/common/nm-meta-setting-desc.c:6071
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6084
-#: ../clients/common/nm-meta-setting-desc.c:7471
-#: ../clients/common/nm-meta-setting-desc.c:7617
+#: ../clients/common/nm-meta-setting-desc.c:6123
+#: ../clients/common/nm-meta-setting-desc.c:7509
+#: ../clients/common/nm-meta-setting-desc.c:7655
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6103
+#: ../clients/common/nm-meta-setting-desc.c:6142
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6112
+#: ../clients/common/nm-meta-setting-desc.c:6151
 msgid "Parent interface [none]"
 msgstr "親インターフェース [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6135
+#: ../clients/common/nm-meta-setting-desc.c:6174
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5393,11 +5383,11 @@ msgstr ""
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6167
+#: ../clients/common/nm-meta-setting-desc.c:6206
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6169
+#: ../clients/common/nm-meta-setting-desc.c:6208
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5411,11 +5401,11 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6182
+#: ../clients/common/nm-meta-setting-desc.c:6221
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6190
+#: ../clients/common/nm-meta-setting-desc.c:6229
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5438,7 +5428,7 @@ msgstr ""
 "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6292
+#: ../clients/common/nm-meta-setting-desc.c:6331
 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 "
@@ -5457,11 +5447,11 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6330
+#: ../clients/common/nm-meta-setting-desc.c:6369
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6332
+#: ../clients/common/nm-meta-setting-desc.c:6371
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5475,11 +5465,11 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6345
+#: ../clients/common/nm-meta-setting-desc.c:6384
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6353
+#: ../clients/common/nm-meta-setting-desc.c:6392
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5504,162 +5494,162 @@ msgstr ""
 "beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6458
-#: ../clients/common/nm-meta-setting-desc.c:7331
+#: ../clients/common/nm-meta-setting-desc.c:6497
+#: ../clients/common/nm-meta-setting-desc.c:7369
 msgid "Parent device [none]"
 msgstr "親デバイス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6464
+#: ../clients/common/nm-meta-setting-desc.c:6503
 msgid "Local endpoint [none]"
 msgstr "ローカルエンドポイント [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6471
-#: ../clients/common/nm-meta-setting-desc.c:7351
+#: ../clients/common/nm-meta-setting-desc.c:6510
+#: ../clients/common/nm-meta-setting-desc.c:7389
 msgid "Remote"
 msgstr "リモート"
 
-#: ../clients/common/nm-meta-setting-desc.c:6516
+#: ../clients/common/nm-meta-setting-desc.c:6555
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6537
+#: ../clients/common/nm-meta-setting-desc.c:6576
 msgid "Enable encryption [yes]"
 msgstr "暗号化の有効化 [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6543
-#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-meta-setting-desc.c:6582
+#: ../clients/common/nm-secret-agent-simple.c:835
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6553
+#: ../clients/common/nm-meta-setting-desc.c:6592
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6559
+#: ../clients/common/nm-meta-setting-desc.c:6598
 msgid "SCI port [1]"
 msgstr "SCI ポート [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6585
+#: ../clients/common/nm-meta-setting-desc.c:6624
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6606
+#: ../clients/common/nm-meta-setting-desc.c:6645
 msgid "Tap [no]"
 msgstr "Tap [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6632
-#: ../clients/common/nm-meta-setting-desc.c:7538
+#: ../clients/common/nm-meta-setting-desc.c:6671
+#: ../clients/common/nm-meta-setting-desc.c:7576
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6641
+#: ../clients/common/nm-meta-setting-desc.c:6680
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュチャンネル [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6650
+#: ../clients/common/nm-meta-setting-desc.c:6689
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6662
+#: ../clients/common/nm-meta-setting-desc.c:6701
 msgid "PPPoE parent device"
 msgstr "PPPoE 親デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:6668
+#: ../clients/common/nm-meta-setting-desc.c:6707
 msgid "Service [none]"
 msgstr "サービス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6675
+#: ../clients/common/nm-meta-setting-desc.c:6714
 msgid "PPPoE username"
 msgstr "PPPoE ユーザー名"
 
-#: ../clients/common/nm-meta-setting-desc.c:6849
+#: ../clients/common/nm-meta-setting-desc.c:6888
 msgid "Browser only [no]"
 msgstr "ブラウザー専用 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6855
+#: ../clients/common/nm-meta-setting-desc.c:6894
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../clients/common/nm-meta-setting-desc.c:6861
+#: ../clients/common/nm-meta-setting-desc.c:6900
 msgid "PAC script"
 msgstr "PAC スクリプト"
 
-#: ../clients/common/nm-meta-setting-desc.c:6896
-#: ../clients/common/nm-meta-setting-desc.c:7045
+#: ../clients/common/nm-meta-setting-desc.c:6935
+#: ../clients/common/nm-meta-setting-desc.c:7084
 msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7201
+#: ../clients/common/nm-meta-setting-desc.c:7239
 msgid "User ID [none]"
 msgstr "ユーザー ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7207
+#: ../clients/common/nm-meta-setting-desc.c:7245
 msgid "Group ID [none]"
 msgstr "グループ ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7213
+#: ../clients/common/nm-meta-setting-desc.c:7251
 msgid "Enable PI [no]"
 msgstr "PI の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7219
+#: ../clients/common/nm-meta-setting-desc.c:7257
 msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7225
+#: ../clients/common/nm-meta-setting-desc.c:7263
 msgid "Enable multi queue [no]"
 msgstr "複数のキューの有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7238
+#: ../clients/common/nm-meta-setting-desc.c:7276
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7245
+#: ../clients/common/nm-meta-setting-desc.c:7283
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7251
+#: ../clients/common/nm-meta-setting-desc.c:7289
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7260
+#: ../clients/common/nm-meta-setting-desc.c:7298
 msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7270
+#: ../clients/common/nm-meta-setting-desc.c:7308
 msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7338
+#: ../clients/common/nm-meta-setting-desc.c:7376
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7344
+#: ../clients/common/nm-meta-setting-desc.c:7382
 msgid "Local address [none]"
 msgstr "ローカルアドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7357
+#: ../clients/common/nm-meta-setting-desc.c:7395
 msgid "Minimum source port [0]"
 msgstr "最小ソースポート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7363
+#: ../clients/common/nm-meta-setting-desc.c:7401
 msgid "Maximum source port [0]"
 msgstr "最大ソースポート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7369
+#: ../clients/common/nm-meta-setting-desc.c:7407
 msgid "Destination port [8472]"
 msgstr "接続先ポート [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7415
+#: ../clients/common/nm-meta-setting-desc.c:7453
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP 名"
 
-#: ../clients/common/nm-meta-setting-desc.c:7452
-#: ../clients/common/nm-meta-setting-desc.c:7588
+#: ../clients/common/nm-meta-setting-desc.c:7490
+#: ../clients/common/nm-meta-setting-desc.c:7626
 msgid "Cloned MAC [none]"
 msgstr "クローンした MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7479
+#: ../clients/common/nm-meta-setting-desc.c:7517
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5669,7 +5659,7 @@ msgstr ""
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7747
+#: ../clients/common/nm-meta-setting-desc.c:7785
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5677,200 +5667,209 @@ msgstr ""
 "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
 "key、2 または passphrase です。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7809
+#: ../clients/common/nm-meta-setting-desc.c:7847
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "ショートアドレス (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7825
+#: ../clients/common/nm-meta-setting-desc.c:7863
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "PAN 識別子 (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7847
+#: ../clients/common/nm-meta-setting-desc.c:7878
+#, fuzzy
+msgid "Page (<default|0-31>)"
+msgstr "(デフォルト)"
+
+#: ../clients/common/nm-meta-setting-desc.c:7892
+msgid "Channel (<default|0-26>)"
+msgstr ""
+
+#: ../clients/common/nm-meta-setting-desc.c:7913
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "IEEE 802.15.4 (WPAN) 親デバイスまたは接続 UUID"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7974
+#: ../clients/common/nm-meta-setting-desc.c:8040
 msgid "802-1x settings"
 msgstr "802-1x 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7975
+#: ../clients/common/nm-meta-setting-desc.c:8041
 #: ../src/devices/adsl/nm-device-adsl.c:133
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7976
+#: ../clients/common/nm-meta-setting-desc.c:8042
 msgid "bluetooth connection"
 msgstr "bluetooth 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7977
+#: ../clients/common/nm-meta-setting-desc.c:8043
 msgid "Bond device"
 msgstr "Bond デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7978
+#: ../clients/common/nm-meta-setting-desc.c:8044
 msgid "Bridge device"
 msgstr "ブリッジデバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7979
+#: ../clients/common/nm-meta-setting-desc.c:8045
 msgid "Bridge port"
 msgstr "ブリッジポート"
 
-#: ../clients/common/nm-meta-setting-desc.c:7980
+#: ../clients/common/nm-meta-setting-desc.c:8046
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA モバイルブロードバンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7981
+#: ../clients/common/nm-meta-setting-desc.c:8047
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7982
+#: ../clients/common/nm-meta-setting-desc.c:8048
 msgid "DCB settings"
 msgstr "DCB 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7983
+#: ../clients/common/nm-meta-setting-desc.c:8049
 msgid "Dummy settings"
 msgstr "ダミー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7984
+#: ../clients/common/nm-meta-setting-desc.c:8050
 msgid "Ethtool settings"
 msgstr "Ethtool 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7985
+#: ../clients/common/nm-meta-setting-desc.c:8051
 msgid "Generic settings"
 msgstr "汎用設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7986
+#: ../clients/common/nm-meta-setting-desc.c:8052
 msgid "GSM mobile broadband connection"
 msgstr "GSM モバイルブロードバンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7987
-#: ../src/devices/nm-device-infiniband.c:170
+#: ../clients/common/nm-meta-setting-desc.c:8053
+#: ../src/devices/nm-device-infiniband.c:172
 msgid "InfiniBand connection"
 msgstr "InfiniBand 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7988
+#: ../clients/common/nm-meta-setting-desc.c:8054
 msgid "IPv4 protocol"
 msgstr "IPv4 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7989
+#: ../clients/common/nm-meta-setting-desc.c:8055
 msgid "IPv6 protocol"
 msgstr "IPv6 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7990
+#: ../clients/common/nm-meta-setting-desc.c:8056
 msgid "IP-tunnel settings"
 msgstr "IP トンネル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7991
+#: ../clients/common/nm-meta-setting-desc.c:8057
 msgid "MACsec connection"
 msgstr "MACsec 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7992
+#: ../clients/common/nm-meta-setting-desc.c:8058
 msgid "macvlan connection"
 msgstr "macvlan 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7993
+#: ../clients/common/nm-meta-setting-desc.c:8059
 msgid "Match"
 msgstr "一致"
 
-#: ../clients/common/nm-meta-setting-desc.c:7994
+#: ../clients/common/nm-meta-setting-desc.c:8060
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7995
-msgid "OpenVSwitch bridge settings"
-msgstr "OpenVSwitch ブリッジ設定"
+#: ../clients/common/nm-meta-setting-desc.c:8061
+msgid "Open vSwitch bridge settings"
+msgstr "Open vSwitch ブリッジ設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7996
-msgid "OpenVSwitch interface settings"
-msgstr "OpenVSwitch インターフェース設定"
+#: ../clients/common/nm-meta-setting-desc.c:8062
+msgid "Open vSwitch interface settings"
+msgstr "Open vSwitch インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7997
-msgid "OpenVSwitch patch interface settings"
-msgstr "OpenVSwitch パッチインターフェース設定"
+#: ../clients/common/nm-meta-setting-desc.c:8063
+msgid "Open vSwitch patch interface settings"
+msgstr "Open vSwitch パッチインターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7998
-msgid "OpenVSwitch port settings"
-msgstr "OpenVSwitch ポート設定"
+#: ../clients/common/nm-meta-setting-desc.c:8064
+msgid "Open vSwitch port settings"
+msgstr "Open vSwitch ポート設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7999
+#: ../clients/common/nm-meta-setting-desc.c:8065
 msgid "PPP settings"
 msgstr "PPP 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8000
+#: ../clients/common/nm-meta-setting-desc.c:8066
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:8001
+#: ../clients/common/nm-meta-setting-desc.c:8067
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../clients/common/nm-meta-setting-desc.c:8002
+#: ../clients/common/nm-meta-setting-desc.c:8068
 msgid "Serial settings"
 msgstr "シリアル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8003
+#: ../clients/common/nm-meta-setting-desc.c:8069
 msgid "SR-IOV settings"
 msgstr "SR-IOV 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8004
+#: ../clients/common/nm-meta-setting-desc.c:8070
 msgid "Traffic controls"
 msgstr "トラフィックコントロール"
 
-#: ../clients/common/nm-meta-setting-desc.c:8005
+#: ../clients/common/nm-meta-setting-desc.c:8071
 msgid "Team device"
 msgstr "Team デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8006
+#: ../clients/common/nm-meta-setting-desc.c:8072
 msgid "Team port"
 msgstr "Team ポート"
 
-#: ../clients/common/nm-meta-setting-desc.c:8007
+#: ../clients/common/nm-meta-setting-desc.c:8073
 msgid "Tun device"
 msgstr "TUN デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8008
+#: ../clients/common/nm-meta-setting-desc.c:8074
 msgid "User settings"
 msgstr "ユーザー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8009
+#: ../clients/common/nm-meta-setting-desc.c:8075
 #: ../src/devices/nm-device-vlan.c:400
 msgid "VLAN connection"
 msgstr "VLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8010 ../src/nm-manager.c:5135
+#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8011
-#: ../src/devices/nm-device-vxlan.c:370
+#: ../clients/common/nm-meta-setting-desc.c:8077
+#: ../src/devices/nm-device-vxlan.c:371
 msgid "VXLAN connection"
 msgstr "VXLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8012
+#: ../clients/common/nm-meta-setting-desc.c:8078
 msgid "WiMAX connection"
 msgstr "WiMAX 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8013
+#: ../clients/common/nm-meta-setting-desc.c:8079
 msgid "Wired Ethernet"
 msgstr "有線 Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:8014
+#: ../clients/common/nm-meta-setting-desc.c:8080
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8015
+#: ../clients/common/nm-meta-setting-desc.c:8081
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi セキュリティー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8016
+#: ../clients/common/nm-meta-setting-desc.c:8082
 msgid "WPAN settings"
 msgstr "WPAN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8017
+#: ../clients/common/nm-meta-setting-desc.c:8083
 msgid "6LOWPAN settings"
 msgstr "6LOWPAN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8368
+#: ../clients/common/nm-meta-setting-desc.c:8434
 msgid "name"
 msgstr "名前"
 
@@ -5878,13 +5877,13 @@ msgstr "名前"
 msgid "An authentication session is already underway."
 msgstr "認証セッションはすでに実行されています。"
 
-#: ../clients/common/nm-secret-agent-simple.c:255
-#: ../clients/common/nm-secret-agent-simple.c:295
-#: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/common/nm-secret-agent-simple.c:359
-#: ../clients/common/nm-secret-agent-simple.c:519
-#: ../clients/common/nm-secret-agent-simple.c:551
-#: ../clients/common/nm-secret-agent-simple.c:573
+#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:311
+#: ../clients/common/nm-secret-agent-simple.c:339
+#: ../clients/common/nm-secret-agent-simple.c:375
+#: ../clients/common/nm-secret-agent-simple.c:820
+#: ../clients/common/nm-secret-agent-simple.c:852
+#: ../clients/common/nm-secret-agent-simple.c:874
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -5894,29 +5893,38 @@ msgstr "認証セッションはすでに実行されています。"
 msgid "Password"
 msgstr "パスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:265
+#: ../clients/common/nm-secret-agent-simple.c:281
 msgid "Identity"
 msgstr "ID"
 
-#: ../clients/common/nm-secret-agent-simple.c:271
+#: ../clients/common/nm-secret-agent-simple.c:287
 msgid "Private key password"
 msgstr "プライベートキーのパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:326
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "キー"
 
-#: ../clients/common/nm-secret-agent-simple.c:353
+#: ../clients/common/nm-secret-agent-simple.c:369
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "サービス"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:548
+#: ../clients/common/nm-secret-agent-simple.c:816
+#: ../clients/common/nm-secret-agent-simple.c:848
+#: ../clients/common/nm-secret-agent-simple.c:870
+#: ../clients/common/nm-secret-agent-simple.c:892
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "'%s' への接続にはパスワードが必要です。"
+
+#: ../clients/common/nm-secret-agent-simple.c:785
 msgid "Authentication required by wireless network"
 msgstr "ワイヤレスネットワークで必要とされる認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:786
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -5925,64 +5933,56 @@ msgstr ""
 "ワイヤレスネットワーク '%s' へのアクセスには、パスワードまたは暗号キーが必要"
 "です。"
 
-#: ../clients/common/nm-secret-agent-simple.c:489
+#: ../clients/common/nm-secret-agent-simple.c:790
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X の認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:490
+#: ../clients/common/nm-secret-agent-simple.c:791
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:495
+#: ../clients/common/nm-secret-agent-simple.c:796
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:496
+#: ../clients/common/nm-secret-agent-simple.c:797
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "DSL 接続 '%s' にはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:805
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:806
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドのデバイスには PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:508
+#: ../clients/common/nm-secret-agent-simple.c:809
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:514
-#: ../clients/common/nm-secret-agent-simple.c:546
-#: ../clients/common/nm-secret-agent-simple.c:568
+#: ../clients/common/nm-secret-agent-simple.c:815
+#: ../clients/common/nm-secret-agent-simple.c:847
+#: ../clients/common/nm-secret-agent-simple.c:869
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドのネットワークパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:515
-#: ../clients/common/nm-secret-agent-simple.c:547
-#: ../clients/common/nm-secret-agent-simple.c:569
-#: ../clients/common/nm-secret-agent-simple.c:586
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "'%s' への接続にはパスワードが必要です。"
-
-#: ../clients/common/nm-secret-agent-simple.c:528
+#: ../clients/common/nm-secret-agent-simple.c:829
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "MACsec ネットワーク '%s' へのアクセスにはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:532
+#: ../clients/common/nm-secret-agent-simple.c:833
 msgid "MACsec PSK authentication"
 msgstr "MACsec PSK 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:540
+#: ../clients/common/nm-secret-agent-simple.c:841
 msgid "MACsec EAP authentication"
 msgstr "MACsec EAP 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:581
+#: ../clients/common/nm-secret-agent-simple.c:882
 msgid "VPN password required"
 msgstr "VPN パスワードが必要です"
 
@@ -7598,7 +7598,6 @@ msgid "Whether LLDP is enabled for the connection."
 msgstr "この接続に対して LLDP が有効であるかどうか。"
 
 #: ../clients/common/settings-docs.h.in:138
-#, fuzzy
 msgid ""
 "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
 "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet "
@@ -7609,12 +7608,13 @@ msgid ""
 "host names. This feature requires a plugin which supports LLMNR. One such "
 "plugin is dns-systemd-resolved."
 msgstr ""
-"mDNS の接続が実行されるかどうか。利用できる値は、yes: ホスト名を登録して接続"
-"を解決、no: インターフェースに対して mDNS を無効にする 、resolve: ホスト名を"
-"登録せずに mDNS ホスト名の解決を許可、の 3 つになります。現在有効な接続でこの"
-"プロパティーをアップデートすると、変更はすぐに有効になります。この機能には、"
-"mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved など"
-"です。"
+"LLMNR (リンクローカルマルチキャスト名前解決) を接続で有効にするかどうか。"
+"LLMNR はドメインネームシステム (DNS) パケット形式をベースとしたプロトコルで、"
+"IPv4 と IPv6 の両方のホストが同一のローカルリンク上でホストの名前解決を実行で"
+"きるようにするものです。利用できる値は、yes: ホスト名を登録して接続を解決、"
+"no: インターフェースに対して LLMNR を無効にする 、resolve: ホスト名を登録せず"
+"に LLMNR ホスト名の解決を許可、の 3 つになります。この機能には、LLMNR をサ"
+"ポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
 
 #: ../clients/common/settings-docs.h.in:139
 msgid "Interface name of the master device or UUID of the master connection."
@@ -7704,6 +7704,7 @@ msgstr ""
 "がスレーブではない場合は NULL。"
 
 #: ../clients/common/settings-docs.h.in:147
+#, fuzzy
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -7720,9 +7721,10 @@ msgid ""
 "ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
 "that different interfaces yield different addresses. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
-"These effectively create unique IDs per-connection, per-device, per-boot, or "
-"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
+"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", "
+"\"${RANDOM}\". These effectively create unique IDs per-connection, per-"
+"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the "
+"interface name of the device and \"${MAC}\" is the permanent MAC address of "
 "the device. Any unrecognized patterns following '$' are treated verbatim, "
 "however are reserved for future use. You are thus advised to avoid '$' or "
 "escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
@@ -8018,15 +8020,9 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:172
 msgid ""
-"Number to dial when establishing a PPP data session with the GSM-based "
-"mobile broadband network.  Many modems do not require PPP for connections to "
-"the mobile network and thus this property should be left blank, which allows "
-"NetworkManager to select the appropriate settings automatically."
+"Legacy setting that used to help establishing PPP data sessions for GSM-"
+"based modems. Deprecated: 1"
 msgstr ""
-"GSM ベースのモバイルブロードバンドネットワークで PPP データを確立する際のダイ"
-"アル番号。多くのモデムでは、モバイルネットワークへの接続に PPP を必要しないた"
-"め、このプロパティーは空のままにして、NetworkManager が自動的に適切な設定を選"
-"択するようにする必要があります。"
 
 #: ../clients/common/settings-docs.h.in:175
 msgid ""
@@ -8232,6 +8228,7 @@ msgstr ""
 "IPv4 にのみ実装されています。"
 
 #: ../clients/common/settings-docs.h.in:200
+#, fuzzy
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -8244,10 +8241,14 @@ msgid ""
 "values \"mac\" and \"perm-mac\" are supported, which use the current or "
 "permanent MAC address of the device to generate a client identifier with "
 "type ethernet (01). Currently, these options only work for ethernet type of "
-"links. The special value \"stable\" is supported to generate a type 0 client "
+"links. The special value \"duid\" generates a RFC4361-compliant client "
+"identifier based on a hash of the interface name as IAID and /etc/machine-"
+"id. The special value \"stable\" is supported to generate a type 0 client "
 "identifier based on the stable-id (see connection.stable-id) and a per-host "
-"key. If unset, a globally configured default is used. If still unset, the "
-"client-id from the last lease is reused."
+"key. If you set the stable-id, you may want to include the \"${DEVICE}\" or "
+"\"${MAC}\" specifier to get a per-device key. If unset, a globally "
+"configured default is used. If still unset, the default depends on the DHCP "
+"plugin."
 msgstr ""
 "DHCP サーバーに送られる文字列。DHCP サーバーが DHCP リースとオプションをカス"
 "タマイズするのに使用するローカルマシンを識別します。プロパティーが 16 進数 "
@@ -8325,17 +8326,19 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:207
 #: ../clients/common/settings-docs.h.in:227
+#, fuzzy
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
-"this setting.  A lower value is better (higher priority).  Zero selects the "
-"default value, which is 50 for VPNs and 100 for other connections. Note that "
-"the priority is to order DNS settings for multiple active connections.  It "
-"does not disambiguate multiple DNS servers within the same connection "
-"profile. When using dns=default, servers with higher priority will be on top "
-"of resolv.conf.  To prioritize a given server over another one within the "
-"same connection, just specify them in the desired order.  When multiple "
-"devices have configurations with the same priority, the one with an active "
-"default route will be preferred.  Negative values have the special effect of "
+"this setting.  A lower value is better (higher priority). Zero selects a "
+"globally configured default value. If the latter is missing or zero too, it "
+"defaults to 50 for VPNs and 100 for other connections. Note that the "
+"priority is to order DNS settings for multiple active connections.  It does "
+"not disambiguate multiple DNS servers within the same connection profile. "
+"When using dns=default, servers with higher priority will be on top of "
+"resolv.conf.  To prioritize a given server over another one within the same "
+"connection, just specify them in the desired order.  When multiple devices "
+"have configurations with the same priority, the one with an active default "
+"route will be preferred.  Negative values have the special effect of "
 "excluding other configurations with a greater priority value; so in presence "
 "of at least a negative priority, only DNS servers from connections with the "
 "lowest priority value will be used. When using a DNS resolver that supports "
@@ -8431,7 +8434,6 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:213
 #: ../clients/common/settings-docs.h.in:234
-#, fuzzy
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8451,11 +8453,12 @@ msgstr ""
 "ラスに関するドキュメントを参照してください。一般的に、\"auto\" 方法で"
 "は、\"dns\"、\"routes\" などのプロパティーは、自動設定から返された情報に追加"
 "する情報を指定します。\"ignore-auto-routes\" プロパティーと \"ignore-auto-dns"
-"\" プロパティーは、この動作を修正します。アップストリームのネットワークを意味"
-"しない \"shared\"、\"link-local\" などの方法では、このプロパティーを空にする"
-"必要があります。IPv4 方法 \"shared\" の場合は、手動で IPv4 アドレスを 1 つ設"
-"定して IP サブセットを設定できます。設定しない場合は 10.42.x.0/24 が選択され"
-"ます。"
+"\" プロパティーは、この動作を修正します。アップストリームのネットワークなしを"
+"意味する \"shared\"、\"link-local\" などの方法では、このプロパティーを空にす"
+"る必要があります。IPv4 方法 \"shared\" の場合は、手動で IPv4 アドレスを 1 つ"
+"設定して IP サブセットを設定できます。設定しない場合は 10.42.x.0/24 が選択さ"
+"れます。\"shared\" は、共有される uplink ではなく、インターネットをサブネット"
+"に共有するインターフェイス上で設定される必要があることに注意してください。"
 
 #: ../clients/common/settings-docs.h.in:214
 #: ../clients/common/settings-docs.h.in:235
@@ -8560,6 +8563,7 @@ msgstr ""
 "このオプションで設定した一時アドレスには影響しないことに注意してください。"
 
 #: ../clients/common/settings-docs.h.in:221
+#, fuzzy
 msgid ""
 "A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
 "client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
@@ -8576,14 +8580,16 @@ msgid ""
 "LLT, the time field will contain a constant timestamp that is used globally "
 "(for all profiles) and persisted to disk. The special values \"stable-llt\", "
 "\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
-"type, derived from the connection's stable-id and a per-host unique key. So, "
-"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
-"generated address derived from the stable id. The DUID-LLT time value in the "
-"\"stable-llt\" option will be picked among a static timespan of three years "
-"(the upper bound of the interval is the same constant timestamp used in \"llt"
-"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
-"duid\" is used. If no global value is provided, the default \"lease\" value "
-"is assumed."
+"type, derived from the connection's stable-id and a per-host unique key. You "
+"may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-"
+"id, in case this profile gets activated on multiple devices. So, the link-"
+"layer address of \"stable-ll\" and \"stable-llt\" will be a generated "
+"address derived from the stable id. The DUID-LLT time value in the \"stable-"
+"llt\" option will be picked among a static timespan of three years (the "
+"upper bound of the interval is the same constant timestamp used in \"llt\"). "
+"When the property is unset, the global value provided for \"ipv6.dhcp-duid\" "
+"is used. If no global value is provided, the default \"lease\" value is "
+"assumed."
 msgstr ""
 "DHCP クライアントが、DHCPv6 サーバー (RFC 3315) に識別してもらうために使用す"
 "る DHCPv6 一意識別子 (DUID) を含む文字列。DUID は、クライアント識別子のオプ"
@@ -9035,19 +9041,26 @@ msgstr ""
 "に設定されていると推測されます。"
 
 #: ../clients/common/settings-docs.h.in:299
-msgid "The total number of virtual functions to create."
-msgstr "作成する仮想関数の総数。"
+msgid ""
+"The total number of virtual functions to create. Note that when the sriov "
+"setting is present NetworkManager enforces the number of virtual functions "
+"on the interface also when it is zero. To prevent any changes to SR-IOV "
+"parameters don't add a sriov setting to the connection."
+msgstr ""
 
 #: ../clients/common/settings-docs.h.in:300
+#, fuzzy
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
 "for each VF. When represented as string a VF is in the form: \"INDEX "
 "[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
-"check=true\". The \"vlans\" attribute is represented as a semicolor-"
-"separated list of VLAN descriptors, where each descriptor has the form \"ID[."
-"PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or "
-"'ad' for 802.1ad."
+"check=true\". Multiple VFs can be specified using a comma as separator. "
+"Currently the following attributes are supported: mac, spoof-check, trust, "
+"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
+"semicolon-separated list of VLAN descriptors, where each descriptor has the "
+"form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the "
+"default) or 'ad' for 802.1ad."
 msgstr ""
 "仮想関数記述子の配列。各 VF 記述子は、GVariant 値に対する辞書マッピング属性名"
 "です。各 VF にとって 'index' エントリーは必須です。文字列で表す場合、VF の形"
@@ -9079,6 +9092,7 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:304
 #: ../clients/common/settings-docs.h.in:322
+#, fuzzy
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9086,7 +9100,7 @@ msgid ""
 "in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-"
 "up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-"
 "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', "
-"'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
+"'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man "
 "for more details."
 msgstr ""
 "接続のリンクウォッチャー設定: リンクウォッチャーはそれぞれディクショナリーに"
@@ -9503,17 +9517,29 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:362
 msgid ""
+"IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
+"whatever the device is already set to\"."
+msgstr ""
+
+#: ../clients/common/settings-docs.h.in:363
+msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
 msgstr ""
 "指定すると、この接続は永続的な MAC アドレスに一致する IEEE 802.15.4 (WPAN) "
 "MAC 層デバイスにのみ適用されます。"
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:364
+msgid ""
+"IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
+"use whatever the device is already set to\"."
+msgstr ""
+
+#: ../clients/common/settings-docs.h.in:365
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "IEEE 802.15.4 パーソナルエリアネットワーク (PAN) 識別子。"
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:366
 msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr "限定環境内にて使用される IEEE 802.15.4 のショートアドレス"
 
@@ -9532,6 +9558,14 @@ msgid "Error: Could not create NMClient object: %s\n"
 msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s\n"
 
 #: ../clients/nm-online.c:252
+msgid "Don't print anything"
+msgstr "出力を抑制する"
+
+#: ../clients/nm-online.c:253
+msgid "Wait for NetworkManager startup instead of a connection"
+msgstr "接続の代わりに NetworkManager の起動を待機します"
+
+#: ../clients/nm-online.c:254
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -9539,18 +9573,10 @@ msgstr ""
 "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は "
 "30)"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:255
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
 
-#: ../clients/nm-online.c:254
-msgid "Don't print anything"
-msgstr "出力を抑制する"
-
-#: ../clients/nm-online.c:255
-msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "接続の代わりに NetworkManager の起動を待機します"
-
 #: ../clients/nm-online.c:275
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
@@ -9588,7 +9614,7 @@ msgid "Could not re-read file: %s"
 msgstr "ファイルの再読み込みができませんでした: %s"
 
 #: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
-#: ../libnm/nm-device.c:1306
+#: ../libnm/nm-device.c:1380
 msgid "Ethernet"
 msgstr "Ethernet"
 
@@ -9598,7 +9624,7 @@ msgid "Ethernet connection %d"
 msgstr "Ethernet 接続 %d"
 
 #: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
-#: ../libnm/nm-device.c:1308
+#: ../libnm/nm-device.c:1382
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -9607,8 +9633,8 @@ msgstr "Wi-Fi"
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2268
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1324
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2376
+#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
@@ -9618,7 +9644,7 @@ msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
 #: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
-#: ../libnm/nm-device.c:1322
+#: ../libnm/nm-device.c:1396
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -9636,10 +9662,10 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2260
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2368
 #: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
-#: ../libnm/nm-device.c:1326
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4784
+#: ../libnm/nm-device.c:1400
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794
 msgid "Bond"
 msgstr "ボンド"
 
@@ -9648,10 +9674,10 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2264
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2372
 #: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
-#: ../libnm/nm-device.c:1330
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5120
+#: ../libnm/nm-device.c:1404
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -9660,10 +9686,10 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2262
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2370
 #: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
-#: ../libnm/nm-device.c:1328
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4887
+#: ../libnm/nm-device.c:1402
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897
 msgid "Team"
 msgstr "team "
 
@@ -9673,8 +9699,8 @@ msgid "Team connection %d"
 msgstr "team 接続 %d"
 
 #: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2266 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1332
+#: ../libnm-core/nm-connection.c:2374 ../libnm-glib/nm-device.c:1840
+#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -10480,9 +10506,9 @@ msgid "NetworkManager is not running."
 msgstr "NetworkManager が実行していません。"
 
 #: ../libnm-core/nm-crypto.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "PEM key file had no start tag"
-msgstr "PEM キーファイルには終了タグ '%s' がありません。"
+msgstr "PEM キーファイルには開始タグがありません"
 
 #: ../libnm-core/nm-crypto.c:222 ../libnm-util/crypto.c:130
 #, c-format
@@ -10548,9 +10574,9 @@ msgid "IV contains non-hexadecimal digits."
 msgstr "IV は 16進法でない数字を含んでいます。"
 
 #: ../libnm-core/nm-crypto.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "IV must contain at least 8 characters"
-msgstr "キーに無効な文字が含まれています"
+msgstr "IV は最低 8 文字が必要"
 
 #: ../libnm-core/nm-crypto.c:580 ../libnm-util/crypto.c:515
 #, c-format
@@ -10578,17 +10604,17 @@ msgid "Failed to decode certificate."
 msgstr "証明書の復号に失敗しました。"
 
 #: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate file is empty"
-msgstr "キーが空です"
+msgstr "証明書ファイルが空です"
 
 #: ../libnm-core/nm-crypto.c:736
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to recognize certificate"
-msgstr "証明書の復号に失敗しました。"
+msgstr "証明書の認識に失敗しました"
 
 #: ../libnm-core/nm-crypto.c:846
-#, fuzzy, c-format
+#, c-format
 msgid "not a valid private key"
 msgstr "無効なプライベートキー"
 
@@ -10597,14 +10623,14 @@ msgid "Failed to initialize the crypto engine."
 msgstr "暗号化エンジンの初期化に失敗しました。"
 
 #: ../libnm-core/nm-crypto-gnutls.c:107 ../libnm-core/nm-crypto-nss.c:129
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported key cipher for decryption"
-msgstr "サポートされていない tfilter オプション: '%s'."
+msgstr "解読がサポートされていないキーの暗号"
 
 #: ../libnm-core/nm-crypto-gnutls.c:117 ../libnm-core/nm-crypto-nss.c:136
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IV length (must be at least %u)."
-msgstr "IV の長さが無効です (最低でも %d は必要)。"
+msgstr "IV の長さが無効です (最低でも %u が必要)。"
 
 #: ../libnm-core/nm-crypto-gnutls.c:134 ../libnm-util/crypto_gnutls.c:175
 #, c-format
@@ -10629,9 +10655,9 @@ msgid "Failed to decrypt the private key."
 msgstr "プライベートキーの復号に失敗しました。"
 
 #: ../libnm-core/nm-crypto-gnutls.c:205 ../libnm-core/nm-crypto-nss.c:289
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported key cipher for encryption"
-msgstr "サポートされていない tfilter オプション: '%s'."
+msgstr "暗号化がサポートされていないキーの暗号"
 
 #: ../libnm-core/nm-crypto-gnutls.c:221 ../libnm-util/crypto_gnutls.c:280
 #, c-format
@@ -10759,9 +10785,9 @@ msgid "Password must be UTF-8"
 msgstr "パスワードは UTF-8 である必要があります"
 
 #: ../libnm-core/nm-crypto-nss.c:462
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't initialize slot"
-msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
+msgstr "スロットを初期化できませんでした"
 
 #: ../libnm-core/nm-crypto-nss.c:470 ../libnm-util/crypto_nss.c:489
 #, c-format
@@ -10782,41 +10808,41 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:283
+#: ../libnm-core/nm-connection.c:301
 msgid "wrong type; should be a list of strings."
 msgstr "正しくないタイプ; 文字列のリストである必要があります。"
 
-#: ../libnm-core/nm-connection.c:353
+#: ../libnm-core/nm-connection.c:371
 msgid "unknown setting name"
 msgstr "不明な設定名"
 
-#: ../libnm-core/nm-connection.c:365
+#: ../libnm-core/nm-connection.c:383
 msgid "duplicate setting name"
 msgstr "重複する設定名"
 
-#: ../libnm-core/nm-connection.c:1325
+#: ../libnm-core/nm-connection.c:1366
 msgid "setting not found"
 msgstr "設定が見つかりません"
 
-#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416
-#: ../libnm-core/nm-connection.c:1441
+#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457
+#: ../libnm-core/nm-connection.c:1482
 msgid "setting is required for non-slave connections"
 msgstr "設定は非スレーブ接続で必要です"
 
-#: ../libnm-core/nm-connection.c:1404 ../libnm-core/nm-connection.c:1429
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470
+#: ../libnm-core/nm-connection.c:1495
 msgid "setting not allowed in slave connection"
 msgstr "設定がスレーブ接続で許可されません"
 
-#: ../libnm-core/nm-connection.c:1544
+#: ../libnm-core/nm-connection.c:1585
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確認するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1588
+#: ../libnm-core/nm-connection.c:1630
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正規化するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:2126 ../libnm-core/nm-setting-8021x.c:2571
+#: ../libnm-core/nm-connection.c:2234 ../libnm-core/nm-setting-8021x.c:2571
 #: ../libnm-core/nm-setting-8021x.c:2588 ../libnm-core/nm-setting-8021x.c:2619
 #: ../libnm-core/nm-setting-8021x.c:2636 ../libnm-core/nm-setting-8021x.c:2678
 #: ../libnm-core/nm-setting-8021x.c:2690 ../libnm-core/nm-setting-8021x.c:2708
@@ -10832,7 +10858,7 @@ msgstr "接続を正規化するときの予期しない障害"
 #: ../libnm-core/nm-setting-ip-tunnel.c:373
 #: ../libnm-core/nm-setting-olpc-mesh.c:118
 #: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
-#: ../libnm-core/nm-setting-vpn.c:490 ../libnm-core/nm-setting-vxlan.c:358
+#: ../libnm-core/nm-setting-vpn.c:550 ../libnm-core/nm-setting-vxlan.c:358
 #: ../libnm-core/nm-setting-wimax.c:124
 #: ../libnm-core/nm-setting-wireless-security.c:918
 #: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
@@ -10858,188 +10884,180 @@ msgstr "接続を正規化するときの予期しない障害"
 msgid "property is missing"
 msgstr "プロパティーがありません"
 
-#: ../libnm-core/nm-connection.c:2271
+#: ../libnm-core/nm-connection.c:2379
 msgid "IP Tunnel"
 msgstr "IP トンネル"
 
-#: ../libnm-core/nm-dbus-utils.c:189
+#: ../libnm-core/nm-dbus-utils.c:202
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
 
-#: ../libnm-core/nm-keyfile.c:200
+#: ../libnm-core/nm-keyfile-utils.c:210
+#, fuzzy, c-format
+msgid "value is not an integer in range [%lld, %lld]"
+msgstr "'%s' は、[%lli, %lli] の範囲外です"
+
+#: ../libnm-core/nm-keyfile.c:210
 msgid "ignoring missing number"
 msgstr "不明な数字を無視"
 
-#: ../libnm-core/nm-keyfile.c:208
+#: ../libnm-core/nm-keyfile.c:218
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効な数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:229
+#: ../libnm-core/nm-keyfile.c:239
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効な %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:271
+#: ../libnm-core/nm-keyfile.c:281
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile.c:292
+#: ../libnm-core/nm-keyfile.c:302
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効な %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:417
+#: ../libnm-core/nm-keyfile.c:427
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:427
+#: ../libnm-core/nm-keyfile.c:437
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:436
+#: ../libnm-core/nm-keyfile.c:446
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:447
+#: ../libnm-core/nm-keyfile.c:457
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s の後のガベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:453
+#: ../libnm-core/nm-keyfile.c:463
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s の後の非推奨のセミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:468
+#: ../libnm-core/nm-keyfile.c:478
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile.c:475
+#: ../libnm-core/nm-keyfile.c:485
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile.c:739
+#: ../libnm-core/nm-keyfile.c:748
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "無効な DNS サーバー IPv%c アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:835 ../libnm-core/nm-keyfile.c:2641
+#: ../libnm-core/nm-keyfile.c:844 ../libnm-core/nm-keyfile.c:2734
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile.c:846
+#: ../libnm-core/nm-keyfile.c:855
 msgid "ignoring invalid MAC address"
 msgstr "有効な MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile.c:1095
+#: ../libnm-core/nm-keyfile.c:1105
 msgid "ignoring invalid SSID"
 msgstr "無効な SSID を無視"
 
-#: ../libnm-core/nm-keyfile.c:1111
+#: ../libnm-core/nm-keyfile.c:1121
 msgid "ignoring invalid raw password"
 msgstr "無効な生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile.c:1248
+#: ../libnm-core/nm-keyfile.c:1258
 msgid "invalid key/cert value"
 msgstr "無効なキー/証明書値"
 
-#: ../libnm-core/nm-keyfile.c:1259
+#: ../libnm-core/nm-keyfile.c:1269
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効なキー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1275 ../libnm-core/nm-keyfile.c:1358
+#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "証明書またはキーファイル '%s' が存在しません"
 
-#: ../libnm-core/nm-keyfile.c:1284
+#: ../libnm-core/nm-keyfile.c:1294
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "無効な PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1328
+#: ../libnm-core/nm-keyfile.c:1338
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
 
-#: ../libnm-core/nm-keyfile.c:1337
+#: ../libnm-core/nm-keyfile.c:1347
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効なキー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1370
+#: ../libnm-core/nm-keyfile.c:1380
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効なキー/証明書値は、有効なブロブではありません"
 
-#: ../libnm-core/nm-keyfile.c:1420
+#: ../libnm-core/nm-keyfile.c:1482
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効なパリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:1438
+#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789
+#, fuzzy, c-format
+msgid "invalid setting: %s"
+msgstr "無効な設定名 '%s'"
+
+#: ../libnm-core/nm-keyfile.c:1514
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "無効な team 設定を無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:1481
+#: ../libnm-core/nm-keyfile.c:1557
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "無効な qdisc: %s"
 
-#: ../libnm-core/nm-keyfile.c:1529
+#: ../libnm-core/nm-keyfile.c:1605
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "無効な tfilter: %s"
 
-#: ../libnm-core/nm-keyfile.c:2550
+#: ../libnm-core/nm-keyfile.c:2634
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "設定値のロード中にエラーが発生しました: %s"
 
-#: ../libnm-core/nm-keyfile.c:2575
-#, c-format
-msgid "invalid negative value (%i)"
-msgstr "無効な負の値 (%i)"
-
-#: ../libnm-core/nm-keyfile.c:2596
-#, c-format
-msgid "invalid char value (%i)"
-msgstr "無効な char 値 (%i)"
-
-#: ../libnm-core/nm-keyfile.c:2618
-#, c-format
-msgid "invalid int64 value (%s)"
-msgstr "無効な int64 値 (%s)"
-
-#: ../libnm-core/nm-keyfile.c:2677
-#, c-format
-msgid "too large FLAGS property '%s' (%llu)"
-msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
-
-#: ../libnm-core/nm-keyfile.c:2690
-#, c-format
-msgid "unhandled setting property type '%s'"
-msgstr "プロパティータイプ '%s' の設定が未処理"
+#: ../libnm-core/nm-keyfile.c:2661 ../libnm-core/nm-keyfile.c:2672
+#: ../libnm-core/nm-keyfile.c:2690 ../libnm-core/nm-keyfile.c:2701
+#: ../libnm-core/nm-keyfile.c:2712 ../libnm-core/nm-keyfile.c:2764
+#: ../libnm-core/nm-keyfile.c:2775
+msgid "value cannot be interpreted as integer"
+msgstr ""
 
-#: ../libnm-core/nm-keyfile.c:2711
+#: ../libnm-core/nm-keyfile.c:2810
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効な設定名 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:2754
+#: ../libnm-core/nm-keyfile.c:2855
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "無効なキー '%s.%s'"
 
-#: ../libnm-core/nm-keyfile.c:2769
+#: ../libnm-core/nm-keyfile.c:2870
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "キー '%s.%s' はブール値ではありません"
@@ -11049,7 +11067,7 @@ msgstr "キー '%s.%s' はブール値ではありません"
 msgid "property is not specified"
 msgstr "プロパティーは指定されていません"
 
-#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:306
+#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:314
 #: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
@@ -11057,7 +11075,7 @@ msgstr "'%s' の値は '%s=%s' と一致しません"
 
 #: ../libnm-core/nm-setting-6lowpan.c:137
 #: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:317 ../libnm-core/nm-setting-macvlan.c:161
+#: ../libnm-core/nm-setting-macsec.c:325 ../libnm-core/nm-setting-macvlan.c:161
 #: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
 #: ../libnm-util/nm-setting-vlan.c:567
 #, c-format
@@ -11090,9 +11108,9 @@ msgid "certificate is invalid: %s"
 msgstr "証明書が無効です: %s"
 
 #: ../libnm-core/nm-setting-8021x.c:323
-#, fuzzy, c-format
+#, c-format
 msgid "certificate detected as invalid scheme"
-msgstr "証明書が無効です: %s"
+msgstr "証明書が無効なスキームと検出されました"
 
 #: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
@@ -11116,17 +11134,17 @@ msgstr "証明書が PKCS#11 トークンにない場合は、パスワードは
 #: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
 #: ../libnm-core/nm-setting-connection.c:954
 #: ../libnm-core/nm-setting-connection.c:1002
-#: ../libnm-core/nm-setting-gsm.c:297 ../libnm-core/nm-setting-gsm.c:354
-#: ../libnm-core/nm-setting-gsm.c:391 ../libnm-core/nm-setting-gsm.c:400
+#: ../libnm-core/nm-setting-gsm.c:299 ../libnm-core/nm-setting-gsm.c:356
+#: ../libnm-core/nm-setting-gsm.c:393 ../libnm-core/nm-setting-gsm.c:402
 #: ../libnm-core/nm-setting-ip-config.c:2499
 #: ../libnm-core/nm-setting-ip4-config.c:196
 #: ../libnm-core/nm-setting-ip4-config.c:203
 #: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
-#: ../libnm-core/nm-setting-vpn.c:499 ../libnm-core/nm-setting-vpn.c:509
+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:569
 #: ../libnm-core/nm-setting-wimax.c:133
 #: ../libnm-core/nm-setting-wireless-security.c:948
 #: ../libnm-core/nm-setting-wireless-security.c:972
-#: ../libnm-core/nm-setting.c:1127 ../libnm-util/nm-setting-8021x.c:2331
+#: ../libnm-core/nm-setting.c:1237 ../libnm-util/nm-setting-8021x.c:2331
 #: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
 #: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
 #: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
@@ -11173,7 +11191,7 @@ msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりませ
 #: ../libnm-core/nm-setting-wireless-security.c:1169
 #: ../libnm-core/nm-setting-wireless.c:811
 #: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:129
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:173
 #: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
 #: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
 #: ../libnm-util/nm-setting-8021x.c:2686
@@ -11458,31 +11476,31 @@ msgstr "オフロード機能には、無効のバリアントタイプがあり
 msgid "unknown ethtool option '%s'"
 msgstr "不明な ethtool オプション '%s'"
 
-#: ../libnm-core/nm-setting-gsm.c:310 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "プロパティー値 '%s' が空白、または長過ぎます (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:342 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
 
-#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
 
-#: ../libnm-core/nm-setting-gsm.c:379 ../libnm-util/nm-setting-gsm.c:363
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../libnm-core/nm-setting-gsm.c:413
+#: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "プロパティーが空、または間違ったサイズです"
 
-#: ../libnm-core/nm-setting-gsm.c:423
+#: ../libnm-core/nm-setting-gsm.c:425
 msgid "property must contain only digits"
 msgstr "プロパティーには数字のみ含めることができます"
 
@@ -11726,35 +11744,43 @@ msgstr "選択されたモードに対して一部のフラグは無効です: %
 msgid "wired setting not allowed for mode %s"
 msgstr "モード %s には有線設定が許可されていません"
 
-#: ../libnm-core/nm-setting-macsec.c:250
+#: ../libnm-core/nm-setting-macsec.c:258
 msgid "the key is empty"
 msgstr "キーが空です"
 
-#: ../libnm-core/nm-setting-macsec.c:261
+#: ../libnm-core/nm-setting-macsec.c:269
 #, c-format
 msgid "the key must be %d characters"
 msgstr "キーは %d 文字にする必要があります"
 
-#: ../libnm-core/nm-setting-macsec.c:269
+#: ../libnm-core/nm-setting-macsec.c:277
 msgid "the key contains non-hexadecimal characters"
 msgstr "キーは 16 進数でない文字が含まれています"
 
-#: ../libnm-core/nm-setting-macsec.c:331 ../libnm-core/nm-setting-macvlan.c:175
+#: ../libnm-core/nm-setting-macsec.c:339 ../libnm-core/nm-setting-macvlan.c:175
 #: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "プロパティーおよび '%s:%s' のいずれも指定されていません"
 
-#: ../libnm-core/nm-setting-macsec.c:348
+#: ../libnm-core/nm-setting-macsec.c:360
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP キー管理には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-macsec.c:359
+#: ../libnm-core/nm-setting-macsec.c:369
+msgid "must be either psk (0) or eap (1)"
+msgstr ""
+
+#: ../libnm-core/nm-setting-macsec.c:378
 #, c-format
 msgid "invalid port %d"
 msgstr "無効なポート %d"
 
+#: ../libnm-core/nm-setting-macsec.c:389
+msgid "only valid for psk mode"
+msgstr ""
+
 #: ../libnm-core/nm-setting-macvlan.c:186
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
@@ -11946,59 +11972,64 @@ msgstr "複製 TC qdiscs があります"
 msgid "there are duplicate TC filters"
 msgstr "複製 TC フィルターがあります"
 
-#: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
-#: ../libnm-core/nm-setting-team.c:266
+#: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194
+#: ../libnm-core/nm-setting-team.c:306
 #, c-format
 msgid "%s is out of range [0, %d]"
 msgstr "%s は [0, %d] の範囲外です"
 
-#: ../libnm-core/nm-setting-team.c:175
+#: ../libnm-core/nm-setting-team.c:176
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr "nsna_ping リンクウォッチャーに target-host がありません"
 
-#: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
+#: ../libnm-core/nm-setting-team.c:182 ../libnm-core/nm-setting-team.c:288
 #, c-format
 msgid "target-host '%s' contains invalid characters"
 msgstr "target-host '%s' には無効な文字が含まれています。"
 
-#: ../libnm-core/nm-setting-team.c:241
+#: ../libnm-core/nm-setting-team.c:281
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
 msgstr "arp_ping リンクウォッチャーに %s がありません"
 
-#: ../libnm-core/nm-setting-team.c:254
+#: ../libnm-core/nm-setting-team.c:294
 #, c-format
 msgid "source-host '%s' contains invalid characters"
 msgstr "source-host '%s' に無効な文字が含まれています"
 
-#: ../libnm-core/nm-setting-team.c:1153
+#: ../libnm-core/nm-setting-team.c:312
+#, fuzzy
+msgid "vlanid is out of range [-1, 4094]"
+msgstr "%s は [0, %d] の範囲外です"
+
+#: ../libnm-core/nm-setting-team.c:1220
 #: ../libnm-core/nm-setting-team-port.c:380
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "team 設定が制限サイズを超えています"
 
-#: ../libnm-core/nm-setting-team.c:1179
+#: ../libnm-core/nm-setting-team.c:1246
 #, c-format
 msgid "invalid runner \"%s\""
 msgstr "無効なランナー \"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1192
+#: ../libnm-core/nm-setting-team.c:1259
 #, c-format
 msgid "missing link watcher name"
 msgstr "リンクウォッチャー名がありません"
 
-#: ../libnm-core/nm-setting-team.c:1202
+#: ../libnm-core/nm-setting-team.c:1269
 #, c-format
 msgid "unknown link watcher \"%s\""
 msgstr "不明なリンクウォッチャー \"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1213
+#: ../libnm-core/nm-setting-team.c:1280
 #, c-format
 msgid "missing target host"
 msgstr "ターゲットホストがありません"
 
-#: ../libnm-core/nm-setting-team.c:1221
+#: ../libnm-core/nm-setting-team.c:1288
 #, c-format
 msgid "missing source address"
 msgstr "ソースアドレスがありません"
@@ -12086,36 +12117,36 @@ msgstr "フラグが無効です"
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "vlan 設定には Ethernet 設定も必要です"
 
-#: ../libnm-core/nm-setting-vpn.c:520
+#: ../libnm-core/nm-setting-vpn.c:580
 msgid "cannot set connection.multi-connect for VPN setting"
 msgstr "VPN 設定用に connection.multi-connect を設定できません"
 
-#: ../libnm-core/nm-setting-vpn.c:541
+#: ../libnm-core/nm-setting-vpn.c:601
 #, c-format
 msgid "secret was empty"
 msgstr "シークレットが空です"
 
-#: ../libnm-core/nm-setting-vpn.c:571
+#: ../libnm-core/nm-setting-vpn.c:631
 msgid "setting contained a secret with an empty name"
 msgstr "設定に空の名前のシークレットが含まれていました"
 
-#: ../libnm-core/nm-setting-vpn.c:579
+#: ../libnm-core/nm-setting-vpn.c:639
 #, c-format
 msgid "secret value was empty"
 msgstr "シークレット値が空でした"
 
-#: ../libnm-core/nm-setting-vpn.c:626 ../libnm-core/nm-setting.c:1891
+#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024
 msgid "not a secret property"
 msgstr "シークレットプロパティーではありません"
 
-#: ../libnm-core/nm-setting-vpn.c:632
+#: ../libnm-core/nm-setting-vpn.c:692
 msgid "secret is not of correct type"
 msgstr "シークレットのタイプが正しくありません"
 
-#: ../libnm-core/nm-setting-vpn.c:663
-#, c-format
-msgid "failed to convert value '%s' to uint"
-msgstr "値 '%s' を uint に変換するのに失敗しました"
+#: ../libnm-core/nm-setting-vpn.c:725
+#, fuzzy
+msgid "secret flags property not found"
+msgstr "シークレットフラグプロパティー '%s' が見つかりません"
 
 #: ../libnm-core/nm-setting-vxlan.c:386
 #, c-format
@@ -12234,208 +12265,218 @@ msgstr "Wake-on-WLAN は、未知のフラグの設定を試みています"
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization と cloned-mac-address の値の競合"
 
-#: ../libnm-core/nm-setting.c:771
+#: ../libnm-core/nm-setting-wpan.c:182
+msgid "page must be defined along with a channel"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wpan.c:191
+#, c-format
+msgid "page must be between %d and %d"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wpan.c:202
+#, c-format
+msgid "channel must not be between %d and %d"
+msgstr ""
+
+#: ../libnm-core/nm-setting.c:852
 #, c-format
 msgid "duplicate property"
 msgstr "重複するプロパティー"
 
-#: ../libnm-core/nm-setting.c:819 ../libnm-core/nm-setting.c:866
+#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
 
-#: ../libnm-core/nm-setting.c:838 ../libnm-core/nm-setting.c:852
+#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933
 #, c-format
 msgid "failed to set property: %s"
 msgstr "プロパティーの設定に失敗しました: %s"
 
-#: ../libnm-core/nm-setting.c:880
+#: ../libnm-core/nm-setting.c:961
 #, c-format
 msgid "can not set property: %s"
 msgstr "プロパティーを設定できません: %s"
 
-#: ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:977
 #, c-format
 msgid "unknown property"
 msgstr "不明なプロパティー"
 
-#: ../libnm-core/nm-setting.c:1789
+#: ../libnm-core/nm-setting.c:1935
 msgid "secret not found"
 msgstr "シークレットが見つかりません"
 
-#: ../libnm-core/nm-setting.c:1881
-msgid "secret is not set"
-msgstr "シークレットが設定されていません"
-
-#: ../libnm-core/nm-utils.c:2062
+#: ../libnm-core/nm-utils.c:2045
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "'%s' は有効なハンドラーはありません。"
 
-#: ../libnm-core/nm-utils.c:2158
+#: ../libnm-core/nm-utils.c:2141
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "予期せぬ '%s': 親はすでに選択されています。"
 
-#: ../libnm-core/nm-utils.c:2174
+#: ../libnm-core/nm-utils.c:2157
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "無効なハンドラー: '%s'"
 
-#: ../libnm-core/nm-utils.c:2196
+#: ../libnm-core/nm-utils.c:2179
 msgid "parent not specified."
 msgstr "親が指定されていません。"
 
-#: ../libnm-core/nm-utils.c:2243
+#: ../libnm-core/nm-utils.c:2226
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "サポートされていない qdisc オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2359
+#: ../libnm-core/nm-utils.c:2342
 msgid "action name missing."
 msgstr "アクション名がありません。"
 
-#: ../libnm-core/nm-utils.c:2383
+#: ../libnm-core/nm-utils.c:2366
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "サポートされていないアクションのオプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2521
+#: ../libnm-core/nm-utils.c:2504
 msgid "invalid action: "
 msgstr "無効なアクション: "
 
-#: ../libnm-core/nm-utils.c:2525
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "サポートされていない tfilter オプション: '%s'."
 
-#: ../libnm-core/nm-utils.c:3033
+#: ../libnm-core/nm-utils.c:3110
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
 
-#: ../libnm-core/nm-utils.c:3042
+#: ../libnm-core/nm-utils.c:3119
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3053
+#: ../libnm-core/nm-utils.c:3130
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "%2$s の無効なファイル所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:3064
+#: ../libnm-core/nm-utils.c:3141
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s のファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:3074
+#: ../libnm-core/nm-utils.c:3151
 #, c-format
 msgid "reject %s"
 msgstr "%s の拒否"
 
-#: ../libnm-core/nm-utils.c:3093
+#: ../libnm-core/nm-utils.c:3170
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パスが絶対パスではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3107
+#: ../libnm-core/nm-utils.c:3184
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイルが存在しません (%s)"
 
-#: ../libnm-core/nm-utils.c:3115
+#: ../libnm-core/nm-utils.c:3192
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグインが有効なファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3125
+#: ../libnm-core/nm-utils.c:3202
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブはサポートされていません (%s)"
 
-#: ../libnm-core/nm-utils.c:3207 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3284 ../libnm-util/nm-utils.c:1794
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" バイナリーを見つけることができませんでした"
 
-#: ../libnm-core/nm-utils.c:4224
+#: ../libnm-core/nm-utils.c:4369
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "%lld の場所で、マスクに有効な Ethernet  MAC アドレスではありません"
 
-#: ../libnm-core/nm-utils.c:4239
+#: ../libnm-core/nm-utils.c:4384
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "%2$lld の場所で、有効な Ethernet MAC アドレス #%1$u ではありません"
 
-#: ../libnm-core/nm-utils.c:4275
+#: ../libnm-core/nm-utils.c:4420
 msgid "interface name is too short"
 msgstr "インターフェース名が短すぎます"
 
-#: ../libnm-core/nm-utils.c:4284
+#: ../libnm-core/nm-utils.c:4429
 msgid "interface name is reserved"
 msgstr "インターフェース名が予約されています"
 
-#: ../libnm-core/nm-utils.c:4296
+#: ../libnm-core/nm-utils.c:4441
 msgid "interface name contains an invalid character"
 msgstr "インターフェース名に無効な文字が含まれています"
 
-#: ../libnm-core/nm-utils.c:4302
+#: ../libnm-core/nm-utils.c:4447
 msgid "interface name is longer than 15 characters"
 msgstr "インターフェース名が 15 文字を超えています"
 
-#: ../libnm-core/nm-utils.c:4951
+#: ../libnm-core/nm-utils.c:5107
 msgid "not valid utf-8"
 msgstr "utf-8 ではありません"
 
-#: ../libnm-core/nm-utils.c:4972 ../libnm-core/nm-utils.c:5440
+#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601
 msgid "is not a JSON object"
 msgstr "JSON オブジェクトではありません"
 
-#: ../libnm-core/nm-utils.c:5416 ../libnm-core/nm-utils.c:5756
+#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
 msgid "value is NULL"
 msgstr "値が NULL です"
 
-#: ../libnm-core/nm-utils.c:5416 ../libnm-core/nm-utils.c:5756
+#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
 msgid "value is empty"
 msgstr "値が空です"
 
-#: ../libnm-core/nm-utils.c:5428
+#: ../libnm-core/nm-utils.c:5589
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "%d (%s) で無効な JSON"
 
-#: ../libnm-core/nm-utils.c:6075 ../libnm-core/nm-utils.c:6095
+#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264
 msgid "unterminated escape sequence"
 msgstr "未終了のエスケープシーケンス"
 
-#: ../libnm-core/nm-utils.c:6120
+#: ../libnm-core/nm-utils.c:6289
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "不明な属性 '%s'"
 
-#: ../libnm-core/nm-utils.c:6135
+#: ../libnm-core/nm-utils.c:6304
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
 
-#: ../libnm-core/nm-utils.c:6151
+#: ../libnm-core/nm-utils.c:6320
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効な uint32 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6160
+#: ../libnm-core/nm-utils.c:6329
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効な uint8 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6170
+#: ../libnm-core/nm-utils.c:6339
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効なブール値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6180
+#: ../libnm-core/nm-utils.c:6349
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "タイプ '%s' のサポートされていない属性 '%s'"
@@ -12522,51 +12563,51 @@ msgstr "VPN プラグイン情報の不明な名前"
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報の不明なサービス"
 
-#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1310
+#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1384
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1312
+#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1386
 msgid "OLPC Mesh"
 msgstr "OLPC メッシュ"
 
-#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1320
+#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1394
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1334
+#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1408
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1336
+#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1410
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1338
+#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1412
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1340
+#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1414
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1342
+#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1416
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1344
+#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1418
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1388
+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1462
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1419
+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1493
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1421
+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1495
 msgid "USB"
 msgstr "USB"
 
@@ -12577,7 +12618,7 @@ msgstr "USB"
 #. * the strings otherwise.
 #.
 #: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1734 ../libnm/nm-device.c:1753
+#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -12881,48 +12922,48 @@ msgstr "接続は WiMAX 接続ではありませんでした。"
 msgid "The connection was not a wpan connection."
 msgstr "接続は WPAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device.c:1314
+#: ../libnm/nm-device.c:1388
 msgid "Open vSwitch Interface"
 msgstr "Open vSwitch インターフェース"
 
-#: ../libnm/nm-device.c:1316
+#: ../libnm/nm-device.c:1390
 msgid "Open vSwitch Port"
 msgstr "Open vSwitch ポート"
 
-#: ../libnm/nm-device.c:1318
+#: ../libnm/nm-device.c:1392
 msgid "Open vSwitch Bridge"
 msgstr "Open vSwitch ブリッジ"
 
-#: ../libnm/nm-device.c:1346
+#: ../libnm/nm-device.c:1420
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1348
+#: ../libnm/nm-device.c:1422
 msgid "Dummy"
 msgstr "ダミー"
 
-#: ../libnm/nm-device.c:1350
+#: ../libnm/nm-device.c:1424
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1352
+#: ../libnm/nm-device.c:1426
 msgid "IEEE 802.15.4"
 msgstr "IEEE 802.15.4"
 
-#: ../libnm/nm-device.c:1354
+#: ../libnm/nm-device.c:1428
 msgid "6LoWPAN"
 msgstr "6LoWPAN"
 
-#: ../libnm/nm-device.c:1356
+#: ../libnm/nm-device.c:1430
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:2475
+#: ../libnm/nm-device.c:2549
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続は有効ではありませんでした: %s"
 
-#: ../libnm/nm-device.c:2484
+#: ../libnm/nm-device.c:2558
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
@@ -12931,7 +12972,7 @@ msgstr "デバイスと接続のインターフェース名が一致しません
 msgid "Checkpoint was removed before it was initialized"
 msgstr "チェックポイントが初期化前に削除されました"
 
-#: ../libnm/nm-manager.c:955
+#: ../libnm/nm-manager.c:953
 msgid "Active connection removed before it was initialized"
 msgstr "アクティブな接続が初期化前に削除されました"
 
@@ -12939,7 +12980,7 @@ msgstr "アクティブな接続が初期化前に削除されました"
 msgid "Connection removed before it was initialized"
 msgstr "接続が初期化前に削除されました"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1017
+#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1051
 msgid "No service name specified"
 msgstr "サービス名が指定されていません"
 
@@ -12976,11 +13017,11 @@ msgstr ""
 "状態からの解除が阻止されます"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:7
-msgid "Enable or disable WiFi devices"
+msgid "Enable or disable Wi-Fi devices"
 msgstr "Wi-Fi デバイスを有効または無効にする"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:8
-msgid "System policy prevents enabling or disabling WiFi devices"
+msgid "System policy prevents enabling or disabling Wi-Fi devices"
 msgstr ""
 "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
 
@@ -13014,21 +13055,22 @@ msgid "System policy prevents control of network connections"
 msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
-msgid "Connection sharing via a protected WiFi network"
+msgid "Connection sharing via a protected Wi-Fi network"
 msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+msgid ""
+"System policy prevents sharing connections via a protected Wi-Fi network"
 msgstr ""
 "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
 "ます。"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
-msgid "Connection sharing via an open WiFi network"
+msgid "Connection sharing via an open Wi-Fi network"
 msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
-msgid "System policy prevents sharing connections via an open WiFi network"
+msgid "System policy prevents sharing connections via an open Wi-Fi network"
 msgstr ""
 "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
 "止されます。"
@@ -13093,19 +13135,19 @@ msgstr "接続確認を有効または無効にする"
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "システムポリシーにより、接続確認を有効化または無効化できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1087
+#: ../shared/nm-utils/nm-shared-utils.c:1130
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1094
+#: ../shared/nm-utils/nm-shared-utils.c:1137
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1101
+#: ../shared/nm-utils/nm-shared-utils.c:1144
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -13113,19 +13155,19 @@ msgstr ""
 "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
 "ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1109
+#: ../shared/nm-utils/nm-shared-utils.c:1152
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
 "ありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1118
+#: ../shared/nm-utils/nm-shared-utils.c:1161
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1129
+#: ../shared/nm-utils/nm-shared-utils.c:1172
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -13138,13 +13180,13 @@ msgstr ""
 #. * 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:119
+#: ../src/NetworkManagerUtils.c:120
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %u"
 msgstr "%s %u"
 
-#: ../src/main.c:180 ../src/main.c:314
+#: ../src/main.c:180 ../src/main.c:315
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定の読み込みに失敗しました: %s\n"
@@ -13192,12 +13234,12 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
+#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:339 ../src/nm-iface-helper.c:457
+#: ../src/main.c:340 ../src/nm-iface-helper.c:456
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
@@ -13232,11 +13274,11 @@ msgstr "%s はすでに実行中です (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "%s を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -13250,33 +13292,33 @@ msgstr ""
 msgid "%s Network"
 msgstr "%s ネットワーク"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:270
+#: ../src/devices/bluetooth/nm-device-bt.c:272
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN が要求されましたが、Bluetooth デバイスは NAP をサポートしません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:280
+#: ../src/devices/bluetooth/nm-device-bt.c:282
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "PAN 接続は、GSM、CDMA、またはシリアル設定を指定できません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:293
+#: ../src/devices/bluetooth/nm-device-bt.c:295
 msgid "PAN connection"
 msgstr "PAN 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:300
+#: ../src/devices/bluetooth/nm-device-bt.c:302
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN が要求されましたが、Bluetooth デバイスは DUN をサポートしません"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:310
+#: ../src/devices/bluetooth/nm-device-bt.c:312
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 接続には、GSM または CDMA 設定が含まれる必要があります"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:320
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:322
+#: ../src/devices/wwan/nm-modem-broadband.c:696
 msgid "GSM connection"
 msgstr "GSM 接続"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:324
-#: ../src/devices/wwan/nm-modem-broadband.c:729
+#: ../src/devices/wwan/nm-modem-broadband.c:720
 msgid "CDMA connection"
 msgstr "CDMA 接続"
 
@@ -13285,8 +13327,8 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "不明な/未処理の Bluetooth 接続タイプ"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:353
-#: ../src/devices/nm-device-ethernet.c:1423
-#: ../src/devices/nm-device-infiniband.c:188
+#: ../src/devices/nm-device-ethernet.c:1432
+#: ../src/devices/nm-device-infiniband.c:190
 #: ../src/devices/wifi/nm-device-wifi.c:908
 msgid "connection does not match device"
 msgstr "接続がデバイスに一致しません"
@@ -13307,11 +13349,11 @@ msgstr "ブリッジ接続"
 msgid "Dummy connection"
 msgstr "ダミー接続"
 
-#: ../src/devices/nm-device-ethernet.c:1404
+#: ../src/devices/nm-device-ethernet.c:1413
 msgid "PPPoE connection"
 msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1404
+#: ../src/devices/nm-device-ethernet.c:1413
 msgid "Wired connection"
 msgstr "有線接続"
 
@@ -13320,11 +13362,11 @@ msgstr "有線接続"
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:418
+#: ../src/devices/nm-device-ip-tunnel.c:419
 msgid "IP tunnel connection"
 msgstr "IP トンネル接続"
 
-#: ../src/devices/nm-device-macvlan.c:365
+#: ../src/devices/nm-device-macvlan.c:366
 msgid "MACVLAN connection"
 msgstr "MACVLAN 接続"
 
@@ -13332,15 +13374,15 @@ msgstr "MACVLAN 接続"
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/nm-device-wpan.c:68
+#: ../src/devices/nm-device-wpan.c:69
 msgid "WPAN connection"
 msgstr "WPAN 接続"
 
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:102
 msgid "Team connection"
 msgstr "team 接続"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:124
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:136
 msgid "Mesh"
 msgstr "メッシュ"
 
@@ -13505,59 +13547,74 @@ msgstr "WPA 認証は、共有キー認証と互換性がありません"
 msgid "Failed to determine AP security information"
 msgstr "AP セキュリティー情報の決定に失敗しました。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:691
+#: ../src/devices/wwan/nm-modem-broadband.c:686
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
 
-#: ../src/nm-config.c:521
+#: ../src/nm-config.c:563
+#, fuzzy, c-format
+msgid "Bad '%s' option: "
+msgstr "'%s' オプションが空白です"
+
+#: ../src/nm-config.c:576
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:522
+#: ../src/nm-config.c:577
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:523
+#: ../src/nm-config.c:578
 msgid "System config directory location"
 msgstr "システム設定ディレクトリーの場所"
 
-#: ../src/nm-config.c:524
+#: ../src/nm-config.c:579
 msgid "Internal config file location"
 msgstr "内部設定ファイルの場所"
 
-#: ../src/nm-config.c:525
+#: ../src/nm-config.c:580
 msgid "State file location"
 msgstr "状態ファイルの場所"
 
-#: ../src/nm-config.c:526
+#: ../src/nm-config.c:581
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デバイスの状態ファイル"
 
-#: ../src/nm-config.c:527
+#: ../src/nm-config.c:582
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを ',' で区切った一覧"
 
-#: ../src/nm-config.c:528
+#: ../src/nm-config.c:583
 msgid "Quit after initial configuration"
 msgstr "初期設定後に終了する"
 
-#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299
 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:532
+#: ../src/nm-config.c:587
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:533
+#: ../src/nm-config.c:588
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:534
+#: ../src/nm-config.c:589
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
+#: ../src/nm-config.c:596
+#, fuzzy
+msgid "NetworkManager options"
+msgstr "NetworkManager のパーミッション"
+
+#: ../src/nm-config.c:596
+#, fuzzy
+msgid "Show NetworkManager options"
+msgstr "NetworkManager のパーミッション"
+
 #. Interface/IP config
 #: ../src/nm-iface-helper.c:279
 msgid "The interface to manage"
@@ -13651,40 +13708,91 @@ msgstr ""
 "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
 "ドアロンプロセスです。"
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:422
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "インターフェース名と UUID が’必要です\n"
 
-#: ../src/nm-iface-helper.c:429
+#: ../src/nm-iface-helper.c:428
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
 
-#: ../src/nm-iface-helper.c:447
+#: ../src/nm-iface-helper.c:446
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:485
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効な IID %s\n"
 
-#: ../src/nm-iface-helper.c:497
+#: ../src/nm-iface-helper.c:496
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): 無効な DHCP client-id %s\n"
 
-#: ../src/nm-logging.c:273
+#: ../src/nm-logging.c:275
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:375
+#: ../src/nm-logging.c:377
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
+#~ msgid "Error: Failed to setup a Wi-Fi hotspot"
+#~ msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
+
+#~ msgid "Error: Failed to add/activate new connection: Unknown error"
+#~ msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
+
+#~ msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+#~ msgstr ""
+#~ "UUID '%s' の接続が、'%s' デバイス上に作成されアクティベートされました。\n"
+
+#~ msgid "Hotspot '%s' activated on device '%s'\n"
+#~ msgstr "ホットスポット '%s' が、デバイス '%s' でアクティベートされました\n"
+
+#~ msgid "Device '%s' has been connected.\n"
+#~ msgstr "デバイス '%s'  は接続されています。\n"
+
+#~ msgid ""
+#~ "Number to dial when establishing a PPP data session with the GSM-based "
+#~ "mobile broadband network.  Many modems do not require PPP for connections "
+#~ "to the mobile network and thus this property should be left blank, which "
+#~ "allows NetworkManager to select the appropriate settings automatically."
+#~ msgstr ""
+#~ "GSM ベースのモバイルブロードバンドネットワークで PPP データを確立する際の"
+#~ "ダイアル番号。多くのモデムでは、モバイルネットワークへの接続に PPP を必要"
+#~ "しないため、このプロパティーは空のままにして、NetworkManager が自動的に適"
+#~ "切な設定を選択するようにする必要があります。"
+
+#~ msgid "The total number of virtual functions to create."
+#~ msgstr "作成する仮想関数の総数。"
+
+#~ msgid "invalid negative value (%i)"
+#~ msgstr "無効な負の値 (%i)"
+
+#~ msgid "invalid char value (%i)"
+#~ msgstr "無効な char 値 (%i)"
+
+#~ msgid "invalid int64 value (%s)"
+#~ msgstr "無効な int64 値 (%s)"
+
+#~ msgid "too large FLAGS property '%s' (%llu)"
+#~ msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
+
+#~ msgid "unhandled setting property type '%s'"
+#~ msgstr "プロパティータイプ '%s' の設定が未処理"
+
+#~ msgid "failed to convert value '%s' to uint"
+#~ msgstr "値 '%s' を uint に変換するのに失敗しました"
+
+#~ msgid "secret is not set"
+#~ msgstr "シークレットが設定されていません"
+
 #~ msgid "mdns value %d is not valid"
 #~ msgstr "mdns value %d は無効です"
-- 
cgit 1.3.0-6-gf8a5