summary refs log tree commit diff
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po5677
1 files changed, 3051 insertions, 2626 deletions
diff --git a/po/ja.po b/po/ja.po
index 6c72e12b..c1011a5d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,16 +5,13 @@
 # Satoru SATOH <ssato@redhat.com>, 2005-2007.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
-# lrintel <lrintel@redhat.com>, 2017. #zanata
-# tchuang <tchuang@redhat.com>, 2017. #zanata
-# amoewaki <amoewaki@redhat.com>, 2018. #zanata
-# kemorigu <kemorigu@redhat.com>, 2018. #zanata
-# lrintel <lrintel@redhat.com>, 2018. #zanata
+# kemorigu <kemorigu@redhat.com>, 2019. #zanata
+# lrintel <lrintel@redhat.com>, 2019. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-08 18:22+0100\n"
+"POT-Creation-Date: 2019-05-28 14:23+0200\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"
@@ -25,7 +22,7 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../clients/cli/agent.c:40
+#: ../clients/cli/agent.c:39
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -39,7 +36,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../clients/cli/agent.c:48
+#: ../clients/cli/agent.c:47
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -58,7 +55,7 @@ msgstr ""
 "場合はパスワード入力が求められます。\n"
 "\n"
 
-#: ../clients/cli/agent.c:58
+#: ../clients/cli/agent.c:57
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -76,7 +73,7 @@ msgstr ""
 "を polkit に返します。\n"
 "\n"
 
-#: ../clients/cli/agent.c:68
+#: ../clients/cli/agent.c:67
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -90,50 +87,50 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/agent.c:157
+#: ../clients/cli/agent.c:159
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli は NetworkManager のシークレットエージェントとして適切に登録されまし"
 "た。\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:161
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "エラー: シークレットエージェントの初期化に失敗しました"
 
-#: ../clients/cli/agent.c:178
+#: ../clients/cli/agent.c:180
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
 
-#: ../clients/cli/agent.c:186
+#: ../clients/cli/agent.c:188
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
 
-#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
-#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
-#: ../clients/cli/connections.c:1454
+#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
+#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
+#: ../clients/cli/connections.c:1460
 msgid "GROUP"
 msgstr "グループ"
 
-#: ../clients/cli/common.c:621
+#: ../clients/cli/common.c:644
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "エラー: openconnect が失敗しました: %s\n"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:651
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "エラー: openconnect がステータス %d で失敗しました\n"
 
-#: ../clients/cli/common.c:630
+#: ../clients/cli/common.c:653
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
 
-#: ../clients/cli/common.c:711
+#: ../clients/cli/common.c:741
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -142,134 +139,134 @@ msgstr ""
 "警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
 "ask' オプションがないと尋ねることができません。\n"
 
-#: ../clients/cli/common.c:1211
+#: ../clients/cli/common.c:1241
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
 
-#: ../clients/cli/common.c:1231
+#: ../clients/cli/common.c:1261
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager が起動していません。"
 
-#: ../clients/cli/common.c:1327
+#: ../clients/cli/common.c:1357
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "エラー: 引数 '%s' が認識されません。代わりに --help を渡してください。"
 
-#: ../clients/cli/common.c:1337
+#: ../clients/cli/common.c:1367
 msgid "Error: missing argument. Try passing --help."
 msgstr "エラー: 引数がありません。--help を渡してください。"
 
-#: ../clients/cli/common.c:1390
+#: ../clients/cli/common.c:1436
 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/cli/common.c:1444 ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:88 ../clients/cli/devices.c:438
+#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:537
+#: ../clients/cli/general.c:40 ../clients/cli/general.c:130
+#: ../clients/cli/general.c:135 ../clients/common/nm-client-utils.c:264
 #: ../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
+#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:286
+#: ../clients/common/nm-meta-setting-desc.c:1711
+#: ../clients/common/nm-meta-setting-desc.c:1742
+#: ../clients/common/nm-meta-setting-desc.c:2667
+#: ../clients/common/nm-meta-setting-desc.c:2725
 msgid "unknown"
 msgstr "不明"
 
-#: ../clients/cli/common.c:1399
+#: ../clients/cli/common.c:1445
 msgid "none"
 msgstr "なし"
 
-#: ../clients/cli/common.c:1400
+#: ../clients/cli/common.c:1446
 msgid "portal"
 msgstr "ポータル"
 
-#: ../clients/cli/common.c:1401
+#: ../clients/cli/common.c:1447
 msgid "limited"
 msgstr "制限付き"
 
-#: ../clients/cli/common.c:1402
+#: ../clients/cli/common.c:1448
 msgid "full"
 msgstr "完全"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:63
 msgid "Setting name? "
 msgstr "設定名は? "
 
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:64
 msgid "Property name? "
 msgstr "プロパティー名は? "
 
-#: ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:65
 msgid "Enter connection type: "
 msgstr "接続タイプを入力してください: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:71
+#: ../clients/cli/connections.c:69
 msgid "Connection (name, UUID, or path): "
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:72
+#: ../clients/cli/connections.c:70
 msgid "VPN connection (name, UUID, or path): "
 msgstr "VPN 接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:73
+#: ../clients/cli/connections.c:71
 msgid "Connection(s) (name, UUID, or path): "
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:74
+#: ../clients/cli/connections.c:72
 msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "接続 (名前、UUID、パス または apath): "
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:80
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:83
+#: ../clients/cli/connections.c:81
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
+#: ../clients/cli/connections.c:82 ../clients/common/nm-client-utils.c:275
 msgid "deactivating"
 msgstr "停止中"
 
-#: ../clients/cli/connections.c:85
+#: ../clients/cli/connections.c:83
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:91
+#: ../clients/cli/connections.c:89
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続(準備)"
 
-#: ../clients/cli/connections.c:92
+#: ../clients/cli/connections.c:90
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続(認証が必要)"
 
-#: ../clients/cli/connections.c:93
+#: ../clients/cli/connections.c:91
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:94
+#: ../clients/cli/connections.c:92
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続(IP 設定を取得)"
 
-#: ../clients/cli/connections.c:95
+#: ../clients/cli/connections.c:93
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:96
+#: ../clients/cli/connections.c:94
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:97
+#: ../clients/cli/connections.c:95
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:518
+#: ../clients/cli/connections.c:516
 msgid "never"
 msgstr "しない"
 
@@ -466,7 +463,7 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/connections.c:944
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -623,10 +620,10 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"使い方: nmcli connection add { 引数 | help }\n"
+"使い方: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"引数 := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -758,9 +755,9 @@ msgstr ""
 "                  [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"
@@ -776,6 +773,7 @@ msgstr ""
 "  IP_OPTIONS:\n"
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+"\n"
 
 #: ../clients/cli/connections.c:1068
 #, c-format
@@ -995,343 +993,338 @@ msgstr ""
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/connections.c:1307
+#: ../clients/cli/connections.c:1313
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
+#: ../clients/cli/connections.c:1326 ../clients/cli/connections.c:1411
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:1395
+#: ../clients/cli/connections.c:1401
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../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
+#: ../clients/cli/connections.c:1509 ../clients/cli/devices.c:1447
+#: ../clients/cli/devices.c:1461 ../clients/cli/devices.c:1476
+#: ../clients/cli/devices.c:1534 ../clients/cli/devices.c:1636
 msgid "NAME"
 msgstr "名前"
 
-#: ../clients/cli/connections.c:1591
+#: ../clients/cli/connections.c:1602
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 "無効なフィールド '%s'; 使用できるフィールド: %s および %s、または %s、%s"
 
-#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
+#: ../clients/cli/connections.c:1612 ../clients/cli/connections.c:1620
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' は孤立させる必要があります"
 
-#: ../clients/cli/connections.c:1876
+#: ../clients/cli/connections.c:1880
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "'--order' オプションの正しくない文字列 '%s'"
 
-#: ../clients/cli/connections.c:1901
+#: ../clients/cli/connections.c:1905
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "'--order' オプションの正しくないアイテム '%s'"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1943
 msgid "No connection specified"
 msgstr "接続が指定されていません。"
 
-#: ../clients/cli/connections.c:1950
+#: ../clients/cli/connections.c:1954
 #, c-format
 msgid "%s argument is missing"
 msgstr "%s 引数がありません。"
 
-#: ../clients/cli/connections.c:1968
+#: ../clients/cli/connections.c:1972
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "不明な接続 '%s'"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2001
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数がありません"
 
-#: ../clients/cli/connections.c:2057
+#: ../clients/cli/connections.c:2061
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager のアクティブなプロファイル"
 
-#: ../clients/cli/connections.c:2058
+#: ../clients/cli/connections.c:2062
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../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
+#: ../clients/cli/connections.c:2114 ../clients/cli/connections.c:2859
+#: ../clients/cli/connections.c:2871 ../clients/cli/connections.c:2883
+#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:8868
+#: ../clients/cli/connections.c:8889 ../clients/cli/devices.c:2970
+#: ../clients/cli/devices.c:2982 ../clients/cli/devices.c:2995
+#: ../clients/cli/devices.c:3189 ../clients/cli/devices.c:3200
+#: ../clients/cli/devices.c:3218 ../clients/cli/devices.c:3227
+#: ../clients/cli/devices.c:3248 ../clients/cli/devices.c:3259
+#: ../clients/cli/devices.c:3277 ../clients/cli/devices.c:3721
+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3739
+#: ../clients/cli/devices.c:3751 ../clients/cli/devices.c:3766
+#: ../clients/cli/devices.c:3774 ../clients/cli/devices.c:3949
+#: ../clients/cli/devices.c:3960 ../clients/cli/devices.c:4131
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:2138
+#: ../clients/cli/connections.c:2142
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - そのような接続プロファイルはありません。"
 
-#: ../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
+#: ../clients/cli/connections.c:2233 ../clients/cli/connections.c:2846
+#: ../clients/cli/connections.c:2910 ../clients/cli/connections.c:8385
+#: ../clients/cli/connections.c:8491 ../clients/cli/connections.c:8994
+#: ../clients/cli/devices.c:1721 ../clients/cli/devices.c:1989
+#: ../clients/cli/devices.c:2162 ../clients/cli/devices.c:2270
+#: ../clients/cli/devices.c:2462 ../clients/cli/devices.c:3912
+#: ../clients/cli/devices.c:4137 ../clients/cli/general.c:896
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:2322
+#: ../clients/cli/connections.c:2326
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:2330
+#: ../clients/cli/connections.c:2334
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:2350
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2354
+#, c-format
 msgid "device '%s' not compatible with connection '%s': "
-msgstr "デバイス '%s' は接続 '%s' と互換性がありません:"
+msgstr "デバイス '%s' は接続 '%s' と互換性がありません: "
 
-#: ../clients/cli/connections.c:2383
+#: ../clients/cli/connections.c:2387
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:2386
+#: ../clients/cli/connections.c:2390
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:2437
+#: ../clients/cli/connections.c:2441
 #, c-format
 msgid "Hint: use '%s' to get more details."
-msgstr ""
+msgstr "ヒント: '%s' を使用して詳細を取得します。"
 
-#: ../clients/cli/connections.c:2455
+#: ../clients/cli/connections.c:2459
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (%s) (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
-#: ../clients/cli/connections.c:6716
+#: ../clients/cli/connections.c:2463 ../clients/cli/connections.c:2613
+#: ../clients/cli/connections.c:6701
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:2470 ../clients/cli/connections.c:2592
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../clients/cli/connections.c:2503
+#: ../clients/cli/connections.c:2507
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: タイムアウト (%d 秒) になりました"
 
-#: ../clients/cli/connections.c:2671
+#: ../clients/cli/connections.c:2675
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2684
+#: ../clients/cli/connections.c:2688
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にコロンがありません"
 
-#: ../clients/cli/connections.c:2692
+#: ../clients/cli/connections.c:2696
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' にドットがありません"
 
-#: ../clients/cli/connections.c:2705
+#: ../clients/cli/connections.c:2709
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' の設定名が無効です"
 
-#: ../clients/cli/connections.c:2759
+#: ../clients/cli/connections.c:2763
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2764
+#: ../clients/cli/connections.c:2768
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../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
+#: ../clients/cli/connections.c:2893 ../clients/cli/devices.c:1680
+#: ../clients/cli/devices.c:3027 ../clients/cli/devices.c:3290
+#: ../clients/cli/devices.c:3966
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2915
+#: ../clients/cli/connections.c:2918
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:3024
+#: ../clients/cli/connections.c:3027
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:3040
+#: ../clients/cli/connections.c:3043
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
-#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
+#: ../clients/cli/connections.c:3094 ../clients/cli/connections.c:8599
+#: ../clients/cli/connections.c:8630 ../clients/cli/connections.c:8788
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:3121
+#: ../clients/cli/connections.c:3124
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
 
-#: ../clients/cli/connections.c:3122
+#: ../clients/cli/connections.c:3125
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブな一部の接続が見つかりません。"
 
-#: ../clients/cli/connections.c:3130
+#: ../clients/cli/connections.c:3133
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:3161
+#: ../clients/cli/connections.c:3164
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "接続 '%s' の非アクティブ化に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
-#: ../clients/common/nm-client-utils.c:221
+#: ../clients/cli/connections.c:3415 ../clients/cli/connections.c:3472
+#: ../clients/common/nm-client-utils.c:225
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/cli/connections.c:3435 ../clients/cli/connections.c:3495
+#: ../clients/common/nm-client-utils.c:293
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../clients/cli/connections.c:3626
+#: ../clients/cli/connections.c:3629
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
 
-#: ../clients/cli/connections.c:3979
+#: ../clients/cli/connections.c:3984
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "エラー: 無効なプロパティー '%s': %s。"
 
-#: ../clients/cli/connections.c:3996
-#, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-
-#: ../clients/cli/connections.c:4016
+#: ../clients/cli/connections.c:3998
 #, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
+msgid "Error: failed to %s %s.%s: %s."
+msgstr "エラー: %s %s.%s: %s. に失敗しました"
 
-#: ../clients/cli/connections.c:4050
+#: ../clients/cli/connections.c:4033
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "エラー: '%s' は必須です。"
 
-#: ../clients/cli/connections.c:4077
+#: ../clients/cli/connections.c:4060
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "エラー: 無効なスレーブタイプ; %s。"
 
-#: ../clients/cli/connections.c:4085
+#: ../clients/cli/connections.c:4068
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:4162
+#: ../clients/cli/connections.c:4145
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "エラー: 問題のある接続タイプ: %s"
 
-#: ../clients/cli/connections.c:4208
+#: ../clients/cli/connections.c:4191
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "エラー: '%s': %s"
 
-#: ../clients/cli/connections.c:4229
+#: ../clients/cli/connections.c:4212
 msgid "Error: master is required"
 msgstr "エラー: マスターが必要です"
 
-#: ../clients/cli/connections.c:4288
+#: ../clients/cli/connections.c:4271
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "エラー: ボンドオプション '%s=%s' の追加中にエラー。"
 
-#: ../clients/cli/connections.c:4319
+#: ../clients/cli/connections.c:4302
 #, 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:4350
+#: ../clients/cli/connections.c:4333
 #, 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:4599
+#: ../clients/cli/connections.c:4582
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' の値が不明です。"
 
-#: ../clients/cli/connections.c:4645
+#: ../clients/cli/connections.c:4628
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:4668
+#: ../clients/cli/connections.c:4651
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
+#: ../clients/cli/connections.c:4699 ../clients/cli/connections.c:4715
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "エラー:'%s' があいまいです (%s.%s または %s.%s)。"
 
-#: ../clients/cli/connections.c:4748
+#: ../clients/cli/connections.c:4733
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "エラー: 無効な <setting>.<property> '%s' です。"
 
-#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
+#: ../clients/cli/connections.c:4777 ../clients/cli/connections.c:8431
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
 
-#: ../clients/cli/connections.c:4810
+#: ../clients/cli/connections.c:4795
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1343,32 +1336,32 @@ msgstr[0] ""
 "警告: 名前が '%1$s' の接続が他に %3$u 個あります。uuid が '%2$s' の接続を参照"
 "してください。\n"
 
-#: ../clients/cli/connections.c:4819
+#: ../clients/cli/connections.c:4804
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../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:771
-#: ../clients/common/nm-meta-setting-desc.c:2752
+#: ../clients/cli/connections.c:4857 ../clients/cli/connections.c:6824
+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:529
+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1201
+#: ../clients/cli/general.c:137 ../clients/cli/utils.h:296
+#: ../clients/common/nm-client-utils.c:283
+#: ../clients/common/nm-meta-setting-desc.c:871
+#: ../clients/common/nm-meta-setting-desc.c:2662
 msgid "no"
 msgstr "いいえ"
 
-#: ../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:771
-#: ../clients/common/nm-meta-setting-desc.c:2749
+#: ../clients/cli/connections.c:4858 ../clients/cli/connections.c:6824
+#: ../clients/cli/connections.c:6825 ../clients/cli/devices.c:528
+#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1201
+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
+#: ../clients/common/nm-client-utils.c:282
+#: ../clients/common/nm-meta-setting-desc.c:871
+#: ../clients/common/nm-meta-setting-desc.c:2659
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/connections.c:4959
+#: ../clients/cli/connections.c:4944
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1377,34 +1370,34 @@ msgstr ""
 "さい。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5061
+#: ../clients/cli/connections.c:5046
 #, 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:5067
+#: ../clients/cli/connections.c:5052
 #, 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:5200 ../clients/cli/utils.c:295
+#: ../clients/cli/connections.c:5185 ../clients/cli/utils.c:293
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "エラー: '%s' 引数の値が必要です。"
 
-#: ../clients/cli/connections.c:5207
+#: ../clients/cli/connections.c:5192
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:5278 ../clients/cli/connections.c:5289
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "エラー: '%s' 引数が必要です。"
 
-#: ../clients/cli/connections.c:6269
+#: ../clients/cli/connections.c:6254
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
@@ -1412,7 +1405,7 @@ msgstr "['%s' 設定値]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6378
+#: ../clients/cli/connections.c:6363
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1445,7 +1438,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:6405
+#: ../clients/cli/connections.c:6390
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1464,7 +1457,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6412
+#: ../clients/cli/connections.c:6397
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1485,7 +1478,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6419
+#: ../clients/cli/connections.c:6404
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1500,7 +1493,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:6409
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1513,7 +1506,7 @@ msgstr ""
 "プロパティー詳細を表示します。NM の設定およびプロパティーの全詳細については、"
 "nm-settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:6414
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1528,7 +1521,7 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6434
+#: ../clients/cli/connections.c:6419
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1553,7 +1546,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6443
+#: ../clients/cli/connections.c:6428
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1579,7 +1572,7 @@ msgstr ""
 "永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
 "必要があります。\n"
 
-#: ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6439
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1600,7 +1593,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
 "は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
+#: ../clients/cli/connections.c:6446 ../clients/cli/connections.c:6604
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1609,7 +1602,7 @@ msgstr ""
 "back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:6464
+#: ../clients/cli/connections.c:6449
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1618,7 +1611,7 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6467
+#: ../clients/cli/connections.c:6452
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1645,7 +1638,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
+#: ../clients/cli/connections.c:6474 ../clients/cli/connections.c:6610
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1658,8 +1651,8 @@ msgstr ""
 "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
 "求められます。\n"
 
-#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
-#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
+#: ../clients/cli/connections.c:6479 ../clients/cli/connections.c:6615
+#: ../clients/cli/connections.c:7024 ../clients/cli/connections.c:8011
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "不明なコマンド: '%s'\n"
@@ -1667,7 +1660,7 @@ msgstr "不明なコマンド: '%s'\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6559
+#: ../clients/cli/connections.c:6544
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1693,7 +1686,7 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:6584
+#: ../clients/cli/connections.c:6569
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1704,7 +1697,7 @@ msgstr ""
 "\n"
 "このプロパティーに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:6588
+#: ../clients/cli/connections.c:6573
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1719,7 +1712,7 @@ msgstr ""
 "<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
 "プロパティー値が置換されます ('set' の場合と同じ)。\n"
 
-#: ../clients/cli/connections.c:6594
+#: ../clients/cli/connections.c:6579
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1730,7 +1723,7 @@ msgstr ""
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:6598
+#: ../clients/cli/connections.c:6583
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1765,7 +1758,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6609
+#: ../clients/cli/connections.c:6594
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1778,7 +1771,7 @@ msgstr ""
 "プロパティーの詳細を表示します。NM 設定とプロパティーの詳細は、nm-"
 "settings(5) man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:6614
+#: ../clients/cli/connections.c:6599
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1792,7 +1785,7 @@ msgstr ""
 "プロパティー値を表示します。引数を指定すると、設定または接続全体の値を表示さ"
 "せることもできます。\n"
 
-#: ../clients/cli/connections.c:6622
+#: ../clients/cli/connections.c:6607
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1801,28 +1794,28 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6722
+#: ../clients/cli/connections.c:6707
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続のアクティベートに失敗しました。\n"
 
-#: ../clients/cli/connections.c:6819
+#: ../clients/cli/connections.c:6804
 #, 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:6837
+#: ../clients/cli/connections.c:6822
 #, 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:6873
+#: ../clients/cli/connections.c:6858
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "この接続は保存されません。本当に終了しますか? %s"
 
-#: ../clients/cli/connections.c:6915
+#: ../clients/cli/connections.c:6899
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1831,66 +1824,60 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
 "で 'save' と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7364
-#: ../clients/cli/connections.c:7424
+#: ../clients/cli/connections.c:6933 ../clients/cli/connections.c:7323
+#: ../clients/cli/connections.c:7382
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティーに使用できる値: %s\n"
 
-#: ../clients/cli/connections.c:6953 ../clients/cli/connections.c:7368
-#: ../clients/cli/connections.c:7428
+#: ../clients/cli/connections.c:6937 ../clients/cli/connections.c:7327
+#: ../clients/cli/connections.c:7386
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990
-#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434
+#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:6964
+#: ../clients/cli/connections.c:7331 ../clients/cli/connections.c:7397
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティーの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:6983
+#: ../clients/cli/connections.c:6960
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395
+#: ../clients/cli/connections.c:6978 ../clients/cli/settings.c:414
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../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:7038
+#: ../clients/cli/connections.c:6997
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:7129
+#: ../clients/cli/connections.c:7088
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:7141
+#: ../clients/cli/connections.c:7100
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:7159
+#: ../clients/cli/connections.c:7118
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "利用可能なプロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7167
+#: ../clients/cli/connections.c:7126
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティー %s\n"
 
-#: ../clients/cli/connections.c:7212
+#: ../clients/cli/connections.c:7171
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1901,12 +1888,12 @@ msgstr ""
 "ベートされる可能性があります。\n"
 "本当に保存しますか? %s"
 
-#: ../clients/cli/connections.c:7298
+#: ../clients/cli/connections.c:7257
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:7329
+#: ../clients/cli/connections.c:7288
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -1915,455 +1902,460 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。'save' と入力す"
 "ると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:7377 ../clients/cli/connections.c:7628
-#: ../clients/cli/connections.c:7660
+#: ../clients/cli/connections.c:7335 ../clients/cli/connections.c:7589
+#: ../clients/cli/connections.c:7621
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません。有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:7378
+#: ../clients/cli/connections.c:7336
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
 "ください。\n"
 
-#: ../clients/cli/connections.c:7393 ../clients/cli/connections.c:7559
-#: ../clients/cli/connections.c:7650
+#: ../clients/cli/connections.c:7351 ../clients/cli/connections.c:7521
+#: ../clients/cli/connections.c:7611
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です。[%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7402
+#: ../clients/cli/connections.c:7360
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティー用の設定がありません\n"
 
-#: ../clients/cli/connections.c:7409
+#: ../clients/cli/connections.c:7367
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7466
+#: ../clients/cli/connections.c:7429
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:7491
+#: ../clients/cli/connections.c:7454
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティーになります: %s\n"
 
-#: ../clients/cli/connections.c:7537
+#: ../clients/cli/connections.c:7494 ../clients/cli/connections.c:7544
+#, c-format
+msgid "Error: failed to remove value of '%s': %s\n"
+msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
+
+#: ../clients/cli/connections.c:7499
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません。[%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:7556
+#: ../clients/cli/connections.c:7518
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には、設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:7604
+#: ../clients/cli/connections.c:7565
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティー、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661
+#: ../clients/cli/connections.c:7590 ../clients/cli/connections.c:7622
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
 "用してください\n"
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:7645
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティー: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:7714
+#: ../clients/cli/connections.c:7675
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7719
+#: ../clients/cli/connections.c:7680
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: この接続には、設定 '%s' がありません。\n"
 
-#: ../clients/cli/connections.c:7750
+#: ../clients/cli/connections.c:7711
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティー: %s%s\n"
 
-#: ../clients/cli/connections.c:7752
+#: ../clients/cli/connections.c:7713
 msgid ", neither a valid setting name"
 msgstr "有効な設定名でもありません。"
 
-#: ../clients/cli/connections.c:7768
+#: ../clients/cli/connections.c:7729
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効な検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7776
+#: ../clients/cli/connections.c:7737
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:7791
+#: ../clients/cli/connections.c:7752
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:7794
+#: ../clients/cli/connections.c:7755
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的に修正できません。\n"
 
-#: ../clients/cli/connections.c:7815
+#: ../clients/cli/connections.c:7776
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7867
+#: ../clients/cli/connections.c:7830
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7873
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:7836
+#, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
-msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
+msgstr "エラー: %s' (%s) 接続の保存に失敗しました\n"
 
-#: ../clients/cli/connections.c:7878
+#: ../clients/cli/connections.c:7841
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:7879
+#: ../clients/cli/connections.c:7842
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) が正常に更新されました。\n"
 
-#: ../clients/cli/connections.c:7912
+#: ../clients/cli/connections.c:7875
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7913
+#: ../clients/cli/connections.c:7876
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:7914
+#: ../clients/cli/connections.c:7877
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
 
-#: ../clients/cli/connections.c:7936
+#: ../clients/cli/connections.c:7899
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:7940
+#: ../clients/cli/connections.c:7903
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:7950
+#: ../clients/cli/connections.c:7913
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:7959
+#: ../clients/cli/connections.c:7922
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:7966
+#: ../clients/cli/connections.c:7929
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:8002
+#: ../clients/cli/connections.c:7965
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:8010
+#: ../clients/cli/connections.c:7973
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:8018
+#: ../clients/cli/connections.c:7981
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:8025
+#: ../clients/cli/connections.c:7988
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:8033
+#: ../clients/cli/connections.c:7996
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] は指定できます\n"
 
-#: ../clients/cli/connections.c:8251
+#: ../clients/cli/connections.c:8217
 #, 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:8265 ../clients/cli/connections.c:8426
+#: ../clients/cli/connections.c:8231 ../clients/cli/connections.c:8392
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:8281
+#: ../clients/cli/connections.c:8247
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています。'type' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:8284
+#: ../clients/cli/connections.c:8250
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr ""
 "警告: 既存の接続 '%s' を編集しています。'con-name' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:8311
+#: ../clients/cli/connections.c:8277
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:8313
+#: ../clients/cli/connections.c:8279
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:8315
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:8352
+#: ../clients/cli/connections.c:8318
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:8320
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:8356
+#: ../clients/cli/connections.c:8322
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:8358
+#: ../clients/cli/connections.c:8324
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "すべての接続プロパティーを表示するには 'print' とタイプします。"
 
-#: ../clients/cli/connections.c:8360
+#: ../clients/cli/connections.c:8326
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "プロパティー詳細を表示するには、'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:8388
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
 
-#: ../clients/cli/connections.c:8394
+#: ../clients/cli/connections.c:8360
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#: ../clients/cli/connections.c:8470
+#: ../clients/cli/connections.c:8436
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
 
-#: ../clients/cli/connections.c:8536
+#: ../clients/cli/connections.c:8502
 msgid "New connection name: "
 msgstr "新規の接続名:"
 
-#: ../clients/cli/connections.c:8538
+#: ../clients/cli/connections.c:8504
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026
+#: ../clients/cli/connections.c:8509 ../clients/cli/connections.c:9005
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー: 不明な追加の引数: '%s'。"
 
-#: ../clients/cli/connections.c:8588
+#: ../clients/cli/connections.c:8554
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部の接続が削除されていません。"
 
-#: ../clients/cli/connections.c:8589
+#: ../clients/cli/connections.c:8555
 #, c-format
-msgid "Error: Connection deletion failed: %s"
-msgstr "エラー: 接続の削除に失敗しました: %s"
+msgid "Error: Connection deletion failed: %s\n"
+msgstr "エラー: 接続の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766
+#: ../clients/cli/connections.c:8611 ../clients/cli/connections.c:8732
 #, c-format
 msgid "Error: %s.\n"
 msgstr "エラー: %s。\n"
 
-#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767
+#: ../clients/cli/connections.c:8612 ../clients/cli/connections.c:8733
 #, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: 一部の接続が見つかりません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8697
+#: ../clients/cli/connections.c:8663
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:8707
+#: ../clients/cli/connections.c:8673
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイルが変更されました\n"
 
-#: ../clients/cli/connections.c:8733
+#: ../clients/cli/connections.c:8699
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイルが作成されました\n"
 
-#: ../clients/cli/connections.c:8742
+#: ../clients/cli/connections.c:8708
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイルが削除されました\n"
 
-#: ../clients/cli/connections.c:8804
+#: ../clients/cli/connections.c:8770
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: 接続のリロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8837
+#: ../clients/cli/connections.c:8803
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続のロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8845
+#: ../clients/cli/connections.c:8811
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:8852
+#: ../clients/cli/connections.c:8818
 msgid "File to import: "
 msgstr "インポートするファイル:"
 
-#: ../clients/cli/connections.c:8886
+#: ../clients/cli/connections.c:8852
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数がありません。"
 
-#: ../clients/cli/connections.c:8909
+#: ../clients/cli/connections.c:8883
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8923
+#: ../clients/cli/connections.c:8897
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
 
-#: ../clients/cli/connections.c:8925
+#: ../clients/cli/connections.c:8899
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明なパラメーター: %s"
 
-#: ../clients/cli/connections.c:8936
+#: ../clients/cli/connections.c:8910
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "エラー: 'type' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8940
+#: ../clients/cli/connections.c:8914
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8946
+#: ../clients/cli/connections.c:8923
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "エラー: %s 用の VPN プラグインが見つかりません。"
 
-#: ../clients/cli/connections.c:8953 ../clients/cli/connections.c:9047
+#: ../clients/cli/connections.c:8930 ../clients/cli/connections.c:9026
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:8960
+#: ../clients/cli/connections.c:8939
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' のインポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:9033
+#: ../clients/cli/connections.c:9012
 msgid "Output file name: "
 msgstr "出力ファイル名:"
 
-#: ../clients/cli/connections.c:9038
+#: ../clients/cli/connections.c:9017
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続は VPN ではありません。"
 
-#: ../clients/cli/connections.c:9060
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
 
-#: ../clients/cli/connections.c:9068
+#: ../clients/cli/connections.c:9047
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:9080
+#: ../clients/cli/connections.c:9059
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
 
 #. define some prompts
-#: ../clients/cli/devices.c:39
+#: ../clients/cli/devices.c:37
 msgid "Interface: "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:40
+#: ../clients/cli/devices.c:38
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235
+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1229
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191
+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:339
+#: ../clients/cli/devices.c:333
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<invisible> | %s"
 
-#: ../clients/cli/devices.c:340
+#: ../clients/cli/devices.c:334
 msgid "<invisible>"
 msgstr "<invisible>"
 
-#: ../clients/cli/devices.c:441
+#: ../clients/cli/devices.c:435
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:695
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:689
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -2403,10 +2395,10 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"使い方: nmcli device { コマンド | help }\n"
+"使い方: nmcli device { COMMAND | help }\n"
 "\n"
-"コマンド := { status | show | set | connect | reapply | modify | disconnect "
-"| delete | monitor | wifi | lldp }\n"
+"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
+"delete | monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -2426,7 +2418,7 @@ msgstr ""
 "\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"
@@ -2441,7 +2433,7 @@ msgstr ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:718
+#: ../clients/cli/devices.c:712
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2472,7 +2464,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:733
+#: ../clients/cli/devices.c:727
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2491,7 +2483,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:738
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2513,7 +2505,7 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:756
+#: ../clients/cli/devices.c:750
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2532,7 +2524,7 @@ msgstr ""
 "行った変更で、デバイスの更新を試行します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:767
+#: ../clients/cli/devices.c:761
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2572,7 +2564,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:787
+#: ../clients/cli/devices.c:781
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2593,7 +2585,7 @@ msgstr ""
 "それ以降の接続が自動アクティベートされることがなくなります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:799
+#: ../clients/cli/devices.c:793
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2616,7 +2608,7 @@ msgstr ""
 "コマンドで削除できません。\n"
 "\n"
 
-#: ../clients/cli/devices.c:812
+#: ../clients/cli/devices.c:806
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2639,7 +2631,7 @@ msgstr ""
 "デバイスプロパティーを変更します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:825
+#: ../clients/cli/devices.c:819
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2661,8 +2653,8 @@ msgstr ""
 "インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
 "\n"
 
-#: ../clients/cli/devices.c:837
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:831
+#, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -2714,39 +2706,40 @@ msgid ""
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 msgstr ""
-"使い方: nmcli device wifi { 引数 | help }\n"
+"使い方: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Wi-Fi デバイス上で演算を実行します。\n"
 "\n"
-"引数 := [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
+"auto]]\n"
 "\n"
 "使用可能な Wi-Fi アクセスポイントを一覧表示します。'ifname' オプションと "
-"'bssid' オプションを使用すると、\n"
-"特定のインターフェース用の AP、または特定の BSSID を持つ AP を一覧表示するこ"
-"とができます。\n"
+"'bssid' \n"
+"オプションを使用すると、特定のインターフェース用の AP、または特定の BSSID "
+"を\n"
+"持つ AP を一覧表示することができます。新しい Wi-Fi スキャンをトリガーすべき"
+"か\n"
+"どうか、--rescan フラグが通知します。\n"
 "\n"
-"引数 := connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\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"
-"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。このコマンドによ"
-"り新規の\n"
-"接続が作成され、デバイス上でアクティベートされます。これは、GUI\n"
-"クライアントで SSID をクリックした場合と同じ動作になります。常に新規の接続"
-"が\n"
-"作成されるため、主に新規の Wi-Fi ネットワークに接続する場合に役に立ちます。\n"
-"ネットワーク用の接続がすでに存在する場合は、「nmcli con up id <name>」を使っ"
-"て\n"
-"既存のプロファイルを有効にすることが推奨されます。現時点でサポートされている"
-"のはオープンな\n"
-"WEP ネットワークおよび WPA-PSK  ネットワークのみであることに注意してくださ"
-"い。また、\n"
-"IP 設定は DHCP で取得することが前提となります。\n"
-"\n"
-"引数 := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
-"                          [band a|bg] [channel <channel>] [password "
-"<password>]\n"
+"SSID または BSSID で指定した Wi-Fi ネットワークへ接続します。コマンドで一致す"
+"る接続を探すか、または新規の接続を作成し、デバイス上でアクティベートしま"
+"す。\n"
+"これは、GUI クライアントで SSID をクリックした場合と同じコマンドラインの動"
+"作\n"
+"になります。ネットワーク用の接続がすでに存在する場合は、\n"
+"「nmcli con up id <name>」を使って既存のプロファイルを有効にすることが可能で"
+"す。\n"
+"既存の接続がない場合は、オープンな WEP ネットワークおよび WPA-PSK ネット\n"
+"ワークのみがサポートされている点に注意してください。また、IP 設定は DHCP で\n"
+"取得することが前提となります。\n"
+"\n"
+"ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                     [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "Wi-Fi ホットスポットを作成します。'connection down' または 'device "
 "disconnect' で\n"
@@ -2760,21 +2753,21 @@ msgstr ""
 "channel - Wi-Fi channel to use\n"
 "password - password to use for the hotspot\n"
 "\n"
-"引数 := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
-"\n"
-"NetworkManager が直ちに利用可能なアクセスポイントを再スキャンすることをリクエ"
-"ストします。\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"NetworkManager は定期的に Wi-Fi ネットワークをスキャンしますが、\n"
+"NetworkManager が直ちに利用可能なアクセスポイントを再スキャンすることをリク"
+"エ\n"
+"ストします。NetworkManager は定期的に Wi-Fi ネットワークをスキャンします"
+"が、\n"
 "スキャンを手動で開始することが便利な場合もあります。'ssid' を使用すると特定"
 "の\n"
-"SSID をスキャンすることができ、非表示 SSID の AP で便利です。'ssid' パラメー"
-"ターは複数使用できます。\n"
-"このコマンドは AP を表示しないことに留意してください。\n"
+"SSID をスキャンすることができ、非表示 SSID の AP で便利です。'ssid' パラ"
+"メー\n"
+"ターは複数使用できます。このコマンドは AP を表示しないことに留意してくださ"
+"い。\n"
 "表示するためのコマンドは 'nmcli device wifi list' です。\n"
-"\n"
 
-#: ../clients/cli/devices.c:884
+#: ../clients/cli/devices.c:878
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2795,257 +2788,241 @@ msgstr ""
 "特定のインターフェースの近接デバイスを一覧表示できます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:982
+#: ../clients/cli/devices.c:976
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:1005
+#: ../clients/cli/devices.c:999
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' が重複しています。\n"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:1002
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:1009
+#: ../clients/cli/devices.c:1003
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部のデバイスが見つかりません。"
 
-#: ../clients/cli/devices.c:1040
+#: ../clients/cli/devices.c:1034
 msgid "No interface specified"
 msgstr "インターフェースが指定されていません"
 
-#: ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1053
 #, c-format
 msgid "Device '%s' not found"
 msgstr "デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:1155
+#: ../clients/cli/devices.c:1149
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1156
+#: ../clients/cli/devices.c:1150
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1167
-msgid "WEP"
-msgstr "WEP"
-
-#: ../clients/cli/devices.c:1171
-msgid "WPA1"
-msgstr "WPA1"
-
-#: ../clients/cli/devices.c:1175
-msgid "WPA2"
-msgstr "WPA2"
-
-#: ../clients/cli/devices.c:1180
-msgid "802.1X"
-msgstr "802.1X"
-
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1189
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:1196
+#: ../clients/cli/devices.c:1190
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:1197
+#: ../clients/cli/devices.c:1191
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:1392
+#: ../clients/cli/devices.c:1386
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:1403
+#: ../clients/cli/devices.c:1397
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1701
+#: ../clients/cli/devices.c:1695
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1705
+#: ../clients/cli/devices.c:1699
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
-#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173
-#: ../clients/cli/devices.c:4144
+#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:2167
+#: ../clients/cli/devices.c:4141
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518
+#: ../clients/cli/devices.c:1762 ../clients/cli/general.c:519
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/devices.c:1817
+#: ../clients/cli/devices.c:1811
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1823
+#: ../clients/cli/devices.c:1817
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1862
+#: ../clients/cli/devices.c:1856
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1865
+#: ../clients/cli/devices.c:1859
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1868
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:1862
+#, c-format
 msgid "Error: Failed to activate connection: %s"
-msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
+msgstr "エラー: 接続のアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1938
+#: ../clients/cli/devices.c:1932
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1947
+#: ../clients/cli/devices.c:1941
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr ""
 "エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
 
-#: ../clients/cli/devices.c:2000
+#: ../clients/cli/devices.c:1994
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088
-#: ../clients/cli/devices.c:2325
+#: ../clients/cli/devices.c:2067 ../clients/cli/devices.c:2082
+#: ../clients/cli/devices.c:2319
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399
+#: ../clients/cli/devices.c:2070 ../clients/cli/devices.c:2393
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208
+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2202
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s"
 
-#: ../clients/cli/devices.c:2148 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2142 ../clients/cli/devices.c:2211
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
 
-#: ../clients/cli/devices.c:2242
+#: ../clients/cli/devices.c:2236
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "エラー: デバイス '%s' (%s) からの適用済み接続の読み取りに失敗しました: %s"
 
-#: ../clients/cli/devices.c:2309
+#: ../clients/cli/devices.c:2303
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部のデバイスが切断されませんでした。"
 
-#: ../clients/cli/devices.c:2310
+#: ../clients/cli/devices.c:2304
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2390
+#: ../clients/cli/devices.c:2384
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部のデバイスが削除されませんでした。"
 
-#: ../clients/cli/devices.c:2391
+#: ../clients/cli/devices.c:2385
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2473
+#: ../clients/cli/devices.c:2467
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティーが指定されていません。"
 
-#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505
-#: ../clients/cli/general.c:691 ../clients/cli/general.c:703
+#: ../clients/cli/devices.c:2482 ../clients/cli/devices.c:2499
+#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2494
+#: ../clients/cli/devices.c:2488
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2511
+#: ../clients/cli/devices.c:2505
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "エラー: '自動接続': %s。"
 
-#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717
+#: ../clients/cli/devices.c:2513 ../clients/cli/general.c:718
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' が不明です。"
 
-#: ../clients/cli/devices.c:2568
+#: ../clients/cli/devices.c:2562
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2594
+#: ../clients/cli/devices.c:2588
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デバイスが作成されました\n"
 
-#: ../clients/cli/devices.c:2601
+#: ../clients/cli/devices.c:2595
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デバイスが削除されました\n"
 
-#: ../clients/cli/devices.c:2781
+#: ../clients/cli/devices.c:2775
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2868
+#: ../clients/cli/devices.c:2862
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:3024
+#: ../clients/cli/devices.c:3018
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:3042
+#: ../clients/cli/devices.c:3036
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr ""
 "エラー: 無効な再スキャン引数です: '%s' は [auto、no、yes] にはありません"
 
-#: ../clients/cli/devices.c:3049
+#: ../clients/cli/devices.c:3043
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:3060
+#: ../clients/cli/devices.c:3054
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3054,27 +3031,27 @@ msgstr ""
 "エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
 "NetworkManager Wi-Fi プラグインを確認してください。"
 
-#: ../clients/cli/devices.c:3064 ../clients/cli/devices.c:3324
-#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982
+#: ../clients/cli/devices.c:3058 ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3819 ../clients/cli/devices.c:3979
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:3173
+#: ../clients/cli/devices.c:3167
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:3178
+#: ../clients/cli/devices.c:3172
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:3215
+#: ../clients/cli/devices.c:3209
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は、有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:3245
+#: ../clients/cli/devices.c:3239
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3082,182 +3059,182 @@ msgstr ""
 "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
 "てください。"
 
-#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3290
+#: ../clients/cli/devices.c:3266 ../clients/cli/devices.c:3284
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:3307
+#: ../clients/cli/devices.c:3301
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "エラー: (%s) が接続先となる BSSID は、bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:3313
+#: ../clients/cli/devices.c:3307
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は、SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:3326 ../clients/cli/devices.c:3825
-#: ../clients/cli/devices.c:3984
+#: ../clients/cli/devices.c:3320 ../clients/cli/devices.c:3821
+#: ../clients/cli/devices.c:3981
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3346
+#: ../clients/cli/devices.c:3340
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
 
-#: ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3367
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3375
+#: ../clients/cli/devices.c:3369
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:3403
+#: ../clients/cli/devices.c:3397
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
-msgstr ""
+msgstr "エラー: 接続 '%s' は存在しますが、プロパティーが一致しません。"
 
-#: ../clients/cli/devices.c:3446
+#: ../clients/cli/devices.c:3440
 #, 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:3482
+#: ../clients/cli/devices.c:3477
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3644
+#: ../clients/cli/devices.c:3640
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' は有効な WPA PSK ではありません"
 
-#: ../clients/cli/devices.c:3661
+#: ../clients/cli/devices.c:3657
 #, 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:3677
+#: ../clients/cli/devices.c:3673
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットスポットのパスワード: %s\n"
 
-#: ../clients/cli/devices.c:3748
+#: ../clients/cli/devices.c:3744
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid が長すぎます。"
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3758
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
 
-#: ../clients/cli/devices.c:3787
+#: ../clients/cli/devices.c:3783
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/devices.c:3803
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: チャネルにはバンドも必要です。"
 
-#: ../clients/cli/devices.c:3812
+#: ../clients/cli/devices.c:3808
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: チャンネル '%s' は、バンド '%s' に対して有効ではありません。"
 
-#: ../clients/cli/devices.c:3836
+#: ../clients/cli/devices.c:3832
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "エラー: デバイス '%s' は、AP またはアドホックモードのいずれもサポートしませ"
 "ん。"
 
-#: ../clients/cli/devices.c:3870
+#: ../clients/cli/devices.c:3866
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効なパスワード: %s。"
 
-#: ../clients/cli/devices.c:3945
+#: ../clients/cli/devices.c:3942
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返すことはできません。"
 
 #. Main header name
-#: ../clients/cli/devices.c:4050
+#: ../clients/cli/devices.c:4047
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デバイス"
 
-#: ../clients/cli/devices.c:4160
+#: ../clients/cli/devices.c:4157
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
 
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "asleep"
 msgstr "休止中"
 
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "connecting"
 msgstr "接続中"
 
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "connected (local only)"
 msgstr "接続完了 (ローカルのみ)"
 
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "connected (site only)"
 msgstr "接続完了 (サイトのみ)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
+#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
 msgid "connected"
 msgstr "接続済み"
 
-#: ../clients/cli/general.c:47
+#: ../clients/cli/general.c:46
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
+#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
 msgid "disconnected"
 msgstr "切断済み"
 
-#: ../clients/cli/general.c:137
+#: ../clients/cli/general.c:138
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:165
+#: ../clients/cli/general.c:166
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:179
+#: ../clients/cli/general.c:180
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:179
+#: ../clients/cli/general.c:180
 msgid "started"
 msgstr "起動しました"
 
-#: ../clients/cli/general.c:213
+#: ../clients/cli/general.c:214
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:213
+#: ../clients/cli/general.c:214
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:331
+#: ../clients/cli/general.c:332
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3286,7 +3263,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:342
+#: ../clients/cli/general.c:343
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3303,7 +3280,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/general.c:351
+#: ../clients/cli/general.c:352
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3326,7 +3303,7 @@ msgstr ""
 "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
 "\n"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:364
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3339,7 +3316,7 @@ msgstr ""
 "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
 "\n"
 
-#: ../clients/cli/general.c:371
+#: ../clients/cli/general.c:372
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3365,7 +3342,7 @@ msgstr ""
 "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
 "\n"
 
-#: ../clients/cli/general.c:384
+#: ../clients/cli/general.c:385
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3390,7 +3367,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:394
+#: ../clients/cli/general.c:395
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3403,7 +3380,7 @@ msgstr ""
 "ネットワークをオンに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:402
+#: ../clients/cli/general.c:403
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3416,7 +3393,7 @@ msgstr ""
 "ネットワークをオフに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:410
+#: ../clients/cli/general.c:411
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3435,7 +3412,7 @@ msgstr ""
 "ネットワークの接続状態を取得します。\n"
 "オプションの 'check' 引数を付けると接続を再チェックします。\n"
 
-#: ../clients/cli/general.c:422
+#: ../clients/cli/general.c:423
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3452,7 +3429,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:431
+#: ../clients/cli/general.c:432
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3469,7 +3446,7 @@ msgstr ""
 "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:441
+#: ../clients/cli/general.c:442
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3486,7 +3463,7 @@ msgstr ""
 "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:451
+#: ../clients/cli/general.c:452
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3504,7 +3481,7 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/general.c:461
+#: ../clients/cli/general.c:462
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3519,180 +3496,180 @@ msgstr ""
 "NetworkManager で変更が行われるたびに行を出力します。\n"
 "\n"
 
-#: ../clients/cli/general.c:491
+#: ../clients/cli/general.c:492
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:495
+#: ../clients/cli/general.c:496
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 使用できるのは次のフィールドのみです: %s"
 
-#: ../clients/cli/general.c:548
+#: ../clients/cli/general.c:549
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:552
+#: ../clients/cli/general.c:553
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:641
+#: ../clients/cli/general.c:642
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:645
+#: ../clients/cli/general.c:646
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:727
+#: ../clients/cli/general.c:728
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギングの設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:744
+#: ../clients/cli/general.c:745
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:813
+#: ../clients/cli/general.c:814
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "エラー: '--fields' の値 '%s' はここでは無効です (使用できるフィールド: %s)"
 
-#: ../clients/cli/general.c:838
+#: ../clients/cli/general.c:839
 #, 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:886 ../clients/cli/general.c:898
+#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:901
+#: ../clients/cli/general.c:902
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr ""
 "エラー: 'networking' のコマンド '%s' は、有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:915
+#: ../clients/cli/general.c:916
 msgid "Networking"
 msgstr "ネットワーキング"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:950
+#: ../clients/cli/general.c:951
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:980
+#: ../clients/cli/general.c:981
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1007
+#: ../clients/cli/general.c:1008
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:1055
+#: ../clients/cli/general.c:1056
 msgid "NetworkManager has started"
 msgstr "NetworkManager  が起動されました"
 
-#: ../clients/cli/general.c:1055
+#: ../clients/cli/general.c:1056
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager が停止しました"
 
-#: ../clients/cli/general.c:1066
+#: ../clients/cli/general.c:1067
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト名が '%s' に設定されました\n"
 
-#: ../clients/cli/general.c:1081
+#: ../clients/cli/general.c:1082
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' はプライマリー接続です\n"
 
-#: ../clients/cli/general.c:1083
+#: ../clients/cli/general.c:1084
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続がありません\n"
 
-#: ../clients/cli/general.c:1095
+#: ../clients/cli/general.c:1096
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性は '%s' です\n"
 
-#: ../clients/cli/general.c:1109
+#: ../clients/cli/general.c:1110
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager の状態は '%s' です\n"
 
-#: ../clients/cli/general.c:1129
+#: ../clients/cli/general.c:1130
 msgid "connection available"
 msgstr "接続が利用可能"
 
-#: ../clients/cli/general.c:1131
+#: ../clients/cli/general.c:1132
 msgid "connections available"
 msgstr "接続が利用可能"
 
-#: ../clients/cli/general.c:1149
+#: ../clients/cli/general.c:1150
 msgid "autoconnect"
 msgstr "自動接続"
 
-#: ../clients/cli/general.c:1151
+#: ../clients/cli/general.c:1152
 msgid "fw missing"
 msgstr "fw がありません"
 
-#: ../clients/cli/general.c:1156
+#: ../clients/cli/general.c:1157
 msgid "plugin missing"
 msgstr "プラグインがありません"
 
-#: ../clients/cli/general.c:1161
+#: ../clients/cli/general.c:1162
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1163
+#: ../clients/cli/general.c:1164
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1168
+#: ../clients/cli/general.c:1169
 msgid "iface"
 msgstr "iface"
 
-#: ../clients/cli/general.c:1171
+#: ../clients/cli/general.c:1172
 msgid "port"
 msgstr "ポート"
 
-#: ../clients/cli/general.c:1174
+#: ../clients/cli/general.c:1175
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1191
+#: ../clients/cli/general.c:1192
 msgid "master"
 msgstr "マスター"
 
-#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:239
 #: ../clients/tui/nmt-connect-connection-list.c:407
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1197
+#: ../clients/cli/general.c:1198
 msgid "ip4 default"
 msgstr "ip4 デフォルト"
 
-#: ../clients/cli/general.c:1199
+#: ../clients/cli/general.c:1200
 msgid "ip6 default"
 msgstr "ip6 デフォルト"
 
-#: ../clients/cli/general.c:1281
+#: ../clients/cli/general.c:1282
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 接続"
 
-#: ../clients/cli/general.c:1349
+#: ../clients/cli/general.c:1350
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3710,17 +3687,17 @@ msgstr ""
 "使用方法の詳細情報については、nmcli(1) と nmcli-examples(7) の man ページを参"
 "照してください。\n"
 
-#: ../clients/cli/general.c:1370
+#: ../clients/cli/general.c:1371
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
 
-#: ../clients/cli/general.c:1382
+#: ../clients/cli/general.c:1383
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager が実行されていません (待機中)\n"
 
-#: ../clients/cli/nmcli.c:245
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:244
+#, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -3737,7 +3714,7 @@ msgid ""
 "  -p, --pretty                             pretty output\n"
 "  -s, --show-secrets                       allow displaying passwords\n"
 "  -t, --terse                              terse output\n"
-"  -v, --version                            how program version\n"
+"  -v, --version                            show program version\n"
 "  -w, --wait <seconds>                     set timeout waiting for finishing "
 "operations\n"
 "\n"
@@ -3754,24 +3731,21 @@ msgstr ""
 "使い方: 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                            show 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"
@@ -3783,96 +3757,96 @@ msgstr ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:325
+#: ../clients/cli/nmcli.c:324
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/nmcli.c:626
+#: ../clients/cli/nmcli.c:625
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "'%s' に続く、予期せぬファイルの終了\n"
 
-#: ../clients/cli/nmcli.c:634
+#: ../clients/cli/nmcli.c:633
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "'%s' に続く、必要なホワイトスペース\n"
 
-#: ../clients/cli/nmcli.c:646
+#: ../clients/cli/nmcli.c:645
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "'%s' には値が必要です\n"
 
-#: ../clients/cli/nmcli.c:660
+#: ../clients/cli/nmcli.c:659
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "'%s' に続く改行が必要です\n"
 
-#: ../clients/cli/nmcli.c:749
+#: ../clients/cli/nmcli.c:748
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:753
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:762
+#: ../clients/cli/nmcli.c:761
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:767
+#: ../clients/cli/nmcli.c:766
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:782
+#: ../clients/cli/nmcli.c:781
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "エラー: '%s' は、'%s' オプションの有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
+#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は、'%s' オプション用の有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:832
+#: ../clients/cli/nmcli.c:831
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "エラー: '%s' は有効なタイムアウトではありません。"
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:838
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../clients/cli/nmcli.c:847
+#: ../clients/cli/nmcli.c:846
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' は不明です。'nmcli -help' で確認してください。"
 
-#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
+#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "エラー: nmcli がシグナル %s (%d) で終了しました"
 
-#: ../clients/cli/nmcli.c:1060
+#: ../clients/cli/nmcli.c:975
 msgid "Success"
 msgstr "成功"
 
-#: ../clients/cli/polkit-agent.c:69
+#: ../clients/cli/polkit-agent.c:68
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "認証メッセージ: %s\n"
 
-#: ../clients/cli/polkit-agent.c:77
+#: ../clients/cli/polkit-agent.c:76
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "認証エラー: %s\n"
 
-#: ../clients/cli/polkit-agent.c:137
+#: ../clients/cli/polkit-agent.c:136
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
@@ -3887,7 +3861,7 @@ msgstr "'%s' を '%s' に設定しますか? [yes]: "
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s' も消去しますか? [yes]: "
 
-#: ../clients/cli/settings.c:224
+#: ../clients/cli/settings.c:243
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -3895,78 +3869,78 @@ msgstr ""
 "警告: %s.%s が '%s' に設定されましたが、インフラストラクチャモードでは無視さ"
 "れることがあります\n"
 
-#: ../clients/cli/settings.c:243
+#: ../clients/cli/settings.c:262
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 "警告: %s.%s を設定するには、ipv4 と ipv6 の設定を削除する必要があります\n"
 
-#: ../clients/cli/settings.c:245
+#: ../clients/cli/settings.c:264
 msgid "Do you want to remove them? [yes] "
 msgstr "削除しますか? [yes] "
 
-#: ../clients/cli/settings.c:333
+#: ../clients/cli/settings.c:352
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
 
-#: ../clients/cli/settings.c:338 ../clients/cli/settings.c:351
+#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "'%s' は VPN 接続プロファイルではありません"
 
-#: ../clients/cli/settings.c:345
+#: ../clients/cli/settings.c:364
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' は既存のプロファイルの名前ではありません"
 
-#: ../clients/cli/settings.c:389
+#: ../clients/cli/settings.c:408
 #, c-format
 msgid "Warning: %s\n"
 msgstr "警告: %s\n"
 
-#: ../clients/cli/settings.c:392
+#: ../clients/cli/settings.c:411
 #, c-format
 msgid "Info: %s\n"
 msgstr "情報: %s\n"
 
-#: ../clients/cli/settings.c:485
+#: ../clients/cli/settings.c:504
 msgid "don't know how to get the property value"
 msgstr "プロパティー値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:575 ../clients/cli/settings.c:617
+#: ../clients/cli/settings.c:593
 msgid "the property can't be changed"
 msgstr "このプロパティーは変更できません"
 
-#: ../clients/cli/settings.c:731
+#: ../clients/cli/settings.c:671
 msgid "[NM property description]"
 msgstr "[NM プロパティーの詳細]"
 
-#: ../clients/cli/settings.c:741
+#: ../clients/cli/settings.c:681
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
-#: ../clients/cli/utils.c:320
+#: ../clients/cli/utils.c:318
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "エラー: 引数 '%s' が必要ですが、'%s' が指定されました。"
 
-#: ../clients/cli/utils.c:323
+#: ../clients/cli/utils.c:321
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/utils.c:710
+#: ../clients/cli/utils.c:709
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "無効なフィールド '%s%s%s'。そのようなフィールドはありません"
 
-#: ../clients/cli/utils.c:714
+#: ../clients/cli/utils.c:713
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "無効なフィールド '%s%s%s'。使用できるフィールド: [%s]"
 
-#: ../clients/cli/utils.c:810
+#: ../clients/cli/utils.c:809
 #, c-format
 msgid "failure to select field"
 msgstr "フィールドの選択に失敗しました"
@@ -3981,26 +3955,26 @@ msgstr "nmcli 出力の読み込み中にエラーが発生しました: %s\n"
 msgid "Error writing nmcli output: %s\n"
 msgstr "nmcli 出力の書き込み中にエラーが発生しました: %s\n"
 
-#: ../clients/cli/utils.c:1467
+#: ../clients/cli/utils.c:1469
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "ページャーパイプの作成に失敗しました: %s\n"
 
-#: ../clients/cli/utils.c:1475
+#: ../clients/cli/utils.c:1478
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "ページャーのフォークに失敗しました: %s\n"
 
-#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523
+#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "ページャーパイプの複製に失敗しました: %s\n"
 
-#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4949
+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4195
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951
+#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4197
 msgid "off"
 msgstr "オフ"
 
@@ -4017,433 +3991,435 @@ msgstr "%lld - %s"
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:117
-#: ../clients/common/nm-client-utils.c:148
+#: ../clients/common/nm-client-utils.c:121
+#: ../clients/common/nm-client-utils.c:152
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' が不明瞭です (%s)"
 
-#: ../clients/common/nm-client-utils.c:127
+#: ../clients/common/nm-client-utils.c:131
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' は無効です。[%s] か [%s] を使用してください"
 
-#: ../clients/common/nm-client-utils.c:160
+#: ../clients/common/nm-client-utils.c:164
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' は無効です。[%s]、[%s]、または [%s] を使用してください"
 
-#: ../clients/common/nm-client-utils.c:209
+#: ../clients/common/nm-client-utils.c:213
 #, c-format
 msgid "'%s' is ambiguous: %s"
 msgstr "'%s' が不明瞭です: %s"
 
-#: ../clients/common/nm-client-utils.c:219
+#: ../clients/common/nm-client-utils.c:223
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
 
-#: ../clients/common/nm-client-utils.c:261
+#: ../clients/common/nm-client-utils.c:265
 msgid "unmanaged"
 msgstr "管理無し"
 
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:266
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:268
 msgid "connecting (prepare)"
 msgstr "接続中 (準備)"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:269
 msgid "connecting (configuring)"
 msgstr "接続中 (設定中)"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:270
 msgid "connecting (need authentication)"
 msgstr "接続中 (認証が必要)"
 
-#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:271
 msgid "connecting (getting IP configuration)"
 msgstr "接続中 (IP 設定を取得中)"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:272
 msgid "connecting (checking IP connectivity)"
 msgstr "接続中 (IP の接続性チェック)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:273
 msgid "connecting (starting secondary connections)"
 msgstr "接続中 (セカンダリー接続を開始)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:276
 msgid "connection failed"
 msgstr "接続に失敗"
 
-#: ../clients/common/nm-client-utils.c:280
+#: ../clients/common/nm-client-utils.c:284
 msgid "yes (guessed)"
 msgstr "はい (推測)"
 
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:285
 msgid "no (guessed)"
 msgstr "いいえ (推測)"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. 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:1437
+#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:364 ../libnm/nm-device.c:1439
 msgid "Unknown"
 msgstr "不明"
 
-#: ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:292
 msgid "No reason given"
 msgstr "原因不明"
 
-#: ../clients/common/nm-client-utils.c:290
+#: ../clients/common/nm-client-utils.c:294
 msgid "Device is now managed"
 msgstr "デバイスが管理下に置かれました"
 
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:295
 msgid "Device is now unmanaged"
 msgstr "デバイスが管理下から外れました"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:296
 msgid "The device could not be readied for configuration"
 msgstr "デバイスの設定準備ができませんでした"
 
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:297
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:298
 msgid "The IP configuration is no longer valid"
 msgstr "この IP 設定は無効になりました"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:299
 msgid "Secrets were required, but not provided"
 msgstr "シークレットが必要でしたが入力されませんでした"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:300
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X サプリカントが切断されました"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:301
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X サプリカントの設定に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:302
 msgid "802.1X supplicant failed"
 msgstr "802.1X サプリカントが失敗しました"
 
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:303
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:304
 msgid "PPP service failed to start"
 msgstr "PPP サービスの開始に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:305
 msgid "PPP service disconnected"
 msgstr "PPP サービスの接続が切断されました"
 
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:306
 msgid "PPP failed"
 msgstr "PPP の失敗"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:307
 msgid "DHCP client failed to start"
 msgstr "DHCP クライアントの開始に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:308
 msgid "DHCP client error"
 msgstr "DHCP クライアントエラー"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:309
 msgid "DHCP client failed"
 msgstr "DHCP クライアントの失敗"
 
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:310
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの開始に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:311
 msgid "Shared connection service failed"
 msgstr "共有接続サービスの失敗"
 
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの開始に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:313
 msgid "AutoIP service error"
 msgstr "AutoIP サービスエラー"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:314
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスの失敗"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:315
 msgid "The line is busy"
 msgstr "回線が使用中です"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:316
 msgid "No dial tone"
 msgstr "ダイアル音がありません"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:317
 msgid "No carrier could be established"
 msgstr "確立できるキャリアがありませんでした"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:318
 msgid "The dialing request timed out"
 msgstr "ダイアル要求がタイムアウトしました"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:319
 msgid "The dialing attempt failed"
 msgstr "ダイアルの試行に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:320
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:321
 msgid "Failed to select the specified APN"
 msgstr "指定された APN の選択に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:322
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:323
 msgid "Network registration denied"
 msgstr "ネットワークの登録が拒否されました"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:324
 msgid "Network registration timed out"
 msgstr "ネットワークの登録がタイムアウトになりました"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:325
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:326
 msgid "PIN check failed"
 msgstr "PIN 確認に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:327
 msgid "Necessary firmware for the device may be missing"
 msgstr "このデバイスに必要なファームウェアがない可能性があります"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:328
 msgid "The device was removed"
 msgstr "このデバイスは削除されました"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:329
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager がスリープ状態に入りました"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:330
 msgid "The device's active connection disappeared"
 msgstr "このデバイスのアクティブな接続が消滅しました"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:331
 msgid "Device disconnected by user or client"
 msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:332
 msgid "Carrier/link changed"
 msgstr "キャリア/リンクが変更されました"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:333
 msgid "The device's existing connection was assumed"
 msgstr "デバイスの既存の接続とみなされました"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:334
 msgid "The supplicant is now available"
 msgstr "サプリカントが使用できるようになりました"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:335
 msgid "The modem could not be found"
 msgstr "モデムが見つかりませんでした"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:336
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:337
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM モデムの SIM カードが挿入されていません"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:338
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM モデムの SIM PIN が必要です"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:339
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM モデムの SIM PUK が必要です"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:340
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM モデムの SIM が間違っています"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:341
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand デバイスでは接続モードに対応していません"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:342
 msgid "A dependency of the connection failed"
 msgstr "接続依存性の失敗"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:343
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:344
 msgid "ModemManager is unavailable"
 msgstr "ModemManager は使用できません"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:345
 msgid "The Wi-Fi network could not be found"
 msgstr "Wi-Fi ネットワークが見つかりませんでした"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:346
 msgid "A secondary connection of the base connection failed"
 msgstr "ベース接続のセカンダリー接続に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:347
 msgid "DCB or FCoE setup failed"
 msgstr "DCB または FCoE のセットアップに失敗しました"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:348
 msgid "teamd control failed"
 msgstr "teamd の制御に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:349
 msgid "Modem failed or no longer available"
 msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:350
 msgid "Modem now ready and available"
 msgstr "モデムが準備されましたので利用可能です"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:351
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN が間違っています"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:352
 msgid "New connection activation was enqueued"
 msgstr "新規接続アクティベーションがキューに格納されました"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:353
 msgid "The device's parent changed"
 msgstr "デバイスの親が変更されました"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:354
 msgid "The device parent's management changed"
 msgstr "デバイスの親の管理が変更されました"
 
-#: ../clients/common/nm-client-utils.c:351
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:355
 msgid "Open vSwitch database connection failed"
 msgstr "Open vSwitch データベースの接続に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:356
 msgid "A duplicate IP address was detected"
 msgstr "複製された IP アドレスが検出されました"
 
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:357
 msgid "The selected IP method is not supported"
 msgstr "選択された IP メソッドには対応していません"
 
-#: ../clients/common/nm-client-utils.c:354
+#: ../clients/common/nm-client-utils.c:358
 msgid "Failed to configure SR-IOV parameters"
 msgstr "SR-IOV パラメーターの設定に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:360
+#: ../clients/common/nm-client-utils.c:359
+msgid "The Wi-Fi P2P peer could not be found"
+msgstr "Wi-Fi P2P ピアが見つかりませんでした"
+
+#: ../clients/common/nm-client-utils.c:365
 msgid "Unknown reason"
 msgstr "不明な理由"
 
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:366
 msgid "The connection was disconnected"
 msgstr "接続が切断されました"
 
-#: ../clients/common/nm-client-utils.c:362
+#: ../clients/common/nm-client-utils.c:367
 msgid "Disconnected by user"
 msgstr "ユーザーにより切断"
 
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:368
 msgid "The base network connection was interrupted"
 msgstr "基本ネットワーク接続が中断されました。"
 
-#: ../clients/common/nm-client-utils.c:364
+#: ../clients/common/nm-client-utils.c:369
 msgid "The VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期せず停止しました"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:370
 msgid "The VPN service returned invalid configuration"
 msgstr "VPN サービスが無効な設定を返しました"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:371
 msgid "The connection attempt timed out"
 msgstr "接続試行がタイムアウトしました"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:372
 msgid "The VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始しませんでした"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:373
 msgid "The VPN service failed to start"
 msgstr "VPN サービスの開始に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:374
 msgid "No valid secrets"
 msgstr "有効なシークレットはありません"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:375
 msgid "Invalid secrets"
 msgstr "無効なシークレット"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:376
 msgid "The connection was removed"
 msgstr "接続は削除されました"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:377
 msgid "Master connection failed"
 msgstr "マスター接続に失敗しました"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:378
 msgid "Could not create a software link"
 msgstr "ソフトウェアリンクを作成できませんでした"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:379
 msgid "The device disappeared"
 msgstr "デバイスが消滅しました"
 
-#: ../clients/common/nm-meta-setting-access.c:492
+#: ../clients/common/nm-meta-setting-access.c:510
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../clients/common/nm-meta-setting-access.c:507
+#: ../clients/common/nm-meta-setting-access.c:525
 #, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "無効なフィールド '%s%s%s%s%s'; %s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:99
-#: ../clients/common/nm-meta-setting-desc.c:161
+#: ../clients/common/nm-meta-setting-desc.c:311
+#: ../clients/common/nm-meta-setting-desc.c:372
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
 
-#: ../clients/common/nm-meta-setting-desc.c:107
+#: ../clients/common/nm-meta-setting-desc.c:319
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "無効な IP アドレス: %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:133
+#: ../clients/common/nm-meta-setting-desc.c:344
 msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
 "ip[/prefix] ...]'"
@@ -4451,239 +4427,190 @@ msgstr ""
 "有効な構文は以下のようになります: 'ip[/prefix] [next-hop] [metric] "
 "[attribute=val]... [,ip[/prefix] ...]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:172
+#: ../clients/common/nm-meta-setting-desc.c:383
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "次のホップ ('%s') が初回である必要があります"
 
-#: ../clients/common/nm-meta-setting-desc.c:178
+#: ../clients/common/nm-meta-setting-desc.c:389
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "メトリック ('%s') が属性の前にある必要があります"
 
-#: ../clients/common/nm-meta-setting-desc.c:227
+#: ../clients/common/nm-meta-setting-desc.c:437
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "無効なルート: %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:239
-msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
-
-#: ../clients/common/nm-meta-setting-desc.c:446
-#, c-format
-msgid "invalid priority map '%s'"
-msgstr "無効な優先度マップ '%s'"
-
-#: ../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:511
+#: ../clients/common/nm-meta-setting-desc.c:503
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "ファイル '%s' から pac-script を読み込めません"
 
-#: ../clients/common/nm-meta-setting-desc.c:518
+#: ../clients/common/nm-meta-setting-desc.c:510
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "ファイル '%s' には無効な utf-8 が含まれています"
 
-#: ../clients/common/nm-meta-setting-desc.c:531
+#: ../clients/common/nm-meta-setting-desc.c:523
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "'%s' には有効な PAC スクリプトが含まれていません"
 
-#: ../clients/common/nm-meta-setting-desc.c:534
+#: ../clients/common/nm-meta-setting-desc.c:526
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "有効な PAC スクリプトではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:588
+#: ../clients/common/nm-meta-setting-desc.c:579
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "ファイル '%s' からチーム設定を読み込めません"
 
-#: ../clients/common/nm-meta-setting-desc.c:595
+#: ../clients/common/nm-meta-setting-desc.c:586
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "チーム設定ファイル '%s' には無効な utf-8 が含まれています"
 
-#: ../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:610
-#, c-format
-msgid "team configuration must be a JSON object"
-msgstr "チーム設定は JSON オブジェクトである必要があります"
-
-#: ../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:885
+#: ../clients/common/nm-meta-setting-desc.c:1034
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/common/nm-meta-setting-desc.c:1037
+#: ../clients/common/nm-meta-setting-desc.c:1186
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1180
-#: ../clients/common/nm-meta-setting-desc.c:1184
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:1334
+#: ../clients/common/nm-meta-setting-desc.c:1338
 msgid "'%s' is out of range [%"
-msgstr "'%s' は、[0, %u] の範囲外です"
+msgstr "'%s' は [% の範囲外です"
 
-#: ../clients/common/nm-meta-setting-desc.c:1189
+#: ../clients/common/nm-meta-setting-desc.c:1343
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "'%s' は有効な数値ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1243
+#: ../clients/common/nm-meta-setting-desc.c:1400
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "'%s' は、[0, %u] の範囲外です"
 
-#: ../clients/common/nm-meta-setting-desc.c:1286
+#: ../clients/common/nm-meta-setting-desc.c:1446
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1391
+#: ../clients/common/nm-meta-setting-desc.c:1554
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "無効なオプション '%s' です。[%s] の組み合わせを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1396 ../libnm-core/nm-keyfile.c:780
+#: ../clients/common/nm-meta-setting-desc.c:1559 ../libnm-core/nm-keyfile.c:884
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1515
+#: ../clients/common/nm-meta-setting-desc.c:1678
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1517
+#: ../clients/common/nm-meta-setting-desc.c:1680
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1520
+#: ../clients/common/nm-meta-setting-desc.c:1683
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1552
+#: ../clients/common/nm-meta-setting-desc.c:1696
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1558
+#: ../clients/common/nm-meta-setting-desc.c:1702
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1560
+#: ../clients/common/nm-meta-setting-desc.c:1704
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1562
+#: ../clients/common/nm-meta-setting-desc.c:1706
 msgid "LOOSE_BINDING, "
 msgstr "ルースバインディング、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1564
+#: ../clients/common/nm-meta-setting-desc.c:1708
 msgid "MVRP, "
 msgstr "MVRP、"
 
-#: ../clients/common/nm-meta-setting-desc.c:1604
+#: ../clients/common/nm-meta-setting-desc.c:1729
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1610
+#: ../clients/common/nm-meta-setting-desc.c:1735
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1612
+#: ../clients/common/nm-meta-setting-desc.c:1737
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1614
+#: ../clients/common/nm-meta-setting-desc.c:1739
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1679
+#: ../clients/common/nm-meta-setting-desc.c:1957
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1718
-msgid "no item to remove"
-msgstr "削除するアイテムがありません"
-
-#: ../clients/common/nm-meta-setting-desc.c:1722
+#: ../clients/common/nm-meta-setting-desc.c:1967
 #, c-format
-msgid "index '%d' is not in range <0-%d>"
-msgstr "インデックス '%d' は範囲内にありません <0-%d>"
+msgid "cannot set empty \"%s\" option"
+msgstr "空の \"%s\" オプションを設定できません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1737
+#: ../clients/common/nm-meta-setting-desc.c:2026
 #, c-format
-msgid "invalid option '%s'"
-msgstr "無効なオプション '%s'"
-
-#: ../clients/common/nm-meta-setting-desc.c:1739
-msgid "missing option"
-msgstr "足りないオプション"
+msgid "'%u' flags are not valid; use combination of %s"
+msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:1763
+#: ../clients/common/nm-meta-setting-desc.c:2043
 #, c-format
-msgid "'%s' is not a valid MAC"
-msgstr "'%s' は有効な MAC ではありません"
+msgid "'%s' is not a valid number (or out of range)"
+msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../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
+#: ../clients/common/nm-meta-setting-desc.c:2064
+#: ../clients/common/nm-meta-setting-desc.c:4111 ../src/nm-config.c:546
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../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:1867
-#, c-format
-msgid "'%s' is not a valid number (or out of range)"
-msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
+#: ../clients/common/nm-meta-setting-desc.c:2161
+msgid "not a valid hex-string"
+msgstr "有効な 16 進数の文字列ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:1985
+#: ../clients/common/nm-meta-setting-desc.c:2177
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../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:2291
-#, c-format
-msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
+#: ../clients/common/nm-meta-setting-desc.c:2256
+msgid ""
+"too many arguments. Please only specify a private key file and optionally a "
+"password"
+msgstr ""
+"引数が多すぎます。プライベートのキーファイルのみを指定してください。オプショ"
+"ンでパスワードを指定します"
 
-#: ../clients/common/nm-meta-setting-desc.c:2317
+#: ../clients/common/nm-meta-setting-desc.c:2363
 #, c-format
-msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr ""
-"プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
+msgid "failed to set bond option \"%s\""
+msgstr "ボンドオプション \"%s\" の設定に失敗しました"
 
-#: ../clients/common/nm-meta-setting-desc.c:2439
+#: ../clients/common/nm-meta-setting-desc.c:2380
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4721,247 +4648,131 @@ 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:2502
+#: ../clients/common/nm-meta-setting-desc.c:2445
 #, c-format
 msgid "Can not change the connection type"
 msgstr "接続タイプを変更できません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2605
+#: ../clients/common/nm-meta-setting-desc.c:2523
 #, c-format
-msgid "the property doesn't contain permission '%s'"
-msgstr "プロパティーにはパーミッション '%s' が含まれません"
+msgid "invalid permission \"%s\""
+msgstr "無効なパーミッション \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2626
+#: ../clients/common/nm-meta-setting-desc.c:2560
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してくださ"
 "い。"
 
-#: ../clients/common/nm-meta-setting-desc.c:2723
+#: ../clients/common/nm-meta-setting-desc.c:2641
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "値 '%s' は有効な UUID ではありません"
 
-#: ../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:2799
+#: ../clients/common/nm-meta-setting-desc.c:2712
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2805
+#: ../clients/common/nm-meta-setting-desc.c:2718
 msgid "enabled, "
 msgstr "有効、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2807
+#: ../clients/common/nm-meta-setting-desc.c:2720
 msgid "advertise, "
 msgstr "公表、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2809
+#: ../clients/common/nm-meta-setting-desc.c:2722
 msgid "willing, "
 msgstr "用意がある、"
 
-#: ../clients/common/nm-meta-setting-desc.c:2931
+#: ../clients/common/nm-meta-setting-desc.c:2811
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' は有効な DCB フラグではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:2960
+#: ../clients/common/nm-meta-setting-desc.c:2838
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマで区切った 8 つの番号を含ませてください"
 
-#: ../clients/common/nm-meta-setting-desc.c:2976
+#: ../clients/common/nm-meta-setting-desc.c:2852
 #, 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:2979
+#: ../clients/common/nm-meta-setting-desc.c:2855
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3000
+#: ../clients/common/nm-meta-setting-desc.c:2876
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "変更は、'%s' に 1 (有効) が含まれるまで効果はありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3055
+#: ../clients/common/nm-meta-setting-desc.c:2906
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3128
-#: ../clients/common/nm-meta-setting-desc.c:3134
+#: ../clients/common/nm-meta-setting-desc.c:2977
+#: ../clients/common/nm-meta-setting-desc.c:2983
 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:3158
+#: ../clients/common/nm-meta-setting-desc.c:3007
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:3181
+#: ../clients/common/nm-meta-setting-desc.c:3030
 msgid "default"
 msgstr "デフォルト"
 
-#: ../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: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:3381
-#: ../clients/common/nm-meta-setting-desc.c:3625
+#: ../clients/common/nm-meta-setting-desc.c:3194
 #, c-format
-msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
+msgid "invalid IPv%c address '%s'"
+msgstr "無効な IPv%c アドレス '%s'"
 
-#: ../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: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:3481
-#: ../clients/common/nm-meta-setting-desc.c:3730
+#: ../clients/common/nm-meta-setting-desc.c:3321
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効なゲートウェイアドレス '%s'"
 
-#: ../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: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:3833
-#, c-format
-msgid "the property doesn't contain interface name '%s'"
-msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
-
-#: ../clients/common/nm-meta-setting-desc.c:3870
+#: ../clients/common/nm-meta-setting-desc.c:3471
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません。<1-13> を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:3962
+#: ../clients/common/nm-meta-setting-desc.c:3551
 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:3984
+#: ../clients/common/nm-meta-setting-desc.c:3575
+#: ../clients/common/nm-meta-setting-desc.c:3655
 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:4008
-#, c-format
-msgid "the property doesn't contain vf with index %u"
-msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
+"The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
+msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <kind>'"
 
-#: ../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: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:4112
-#, c-format
-msgid "the property doesn't contain tfilter '%s'"
-msgstr "プロパティーには tfilter '%s' が含まれません"
-
-#: ../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: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:3600
+msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
+msgstr "有効な構文: '<vid>[-<vid>] [pvid] [untagged]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4434
+#: ../clients/common/nm-meta-setting-desc.c:3875
 #, 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:4442
-#, c-format
-msgid "the property doesn't contain mapping '%s'"
-msgstr "プロパティーにはマッピング '%s' が含まれません"
-
-#: ../clients/common/nm-meta-setting-desc.c:4450
-msgid "no priority to remove"
-msgstr "削除する優先度がありません"
-
-#: ../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:4523
-#, c-format
-msgid "'%s' cannot be empty"
-msgstr "'%s' を空白にすることはできません"
-
-#: ../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
-#: ../libnm-util/nm-setting-wireless.c:858
-#: ../libnm-util/nm-setting-wireless.c:872
-#, c-format
-msgid "'%s' is not a valid MAC address"
-msgstr "'%s' は有効な MAC アドレスではありません"
-
-#: ../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' が含まれません"
+msgid "invalid priority map '%s'"
+msgstr "無効な優先度マップ '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4586
+#: ../clients/common/nm-meta-setting-desc.c:3963
 #, 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:4600
-#, c-format
-msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
-
-#: ../clients/common/nm-meta-setting-desc.c:4632
+#: ../clients/common/nm-meta-setting-desc.c:4002
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4972,24 +4783,25 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4666
+#: ../clients/common/nm-meta-setting-desc.c:4037
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4672
+#: ../clients/common/nm-meta-setting-desc.c:4043
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4755
-#: ../clients/common/nm-meta-setting-desc.c:4791
-#: ../clients/common/nm-meta-setting-desc.c:4827
+#: ../clients/common/nm-meta-setting-desc.c:4060
+#: ../libnm-core/nm-setting-sriov.c:443 ../libnm-core/nm-setting-wired.c:786
+#: ../libnm-core/nm-setting-wireless.c:844
+#: ../libnm-core/nm-setting-wireless.c:856
 #, c-format
-msgid "the property doesn't contain protocol '%s'"
-msgstr "プロパティーにはプロトコル '%s' が含まれません"
+msgid "'%s' is not a valid MAC address"
+msgstr "'%s' は有効な MAC アドレスではありません"
 
-#: ../clients/common/nm-meta-setting-desc.c:4864
+#: ../clients/common/nm-meta-setting-desc.c:4120
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -4998,70 +4810,63 @@ msgstr ""
 "'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
 "定してください。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4874
+#: ../clients/common/nm-meta-setting-desc.c:4130
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "WEP キーは '%s' であると仮定しています"
 
-#: ../clients/common/nm-meta-setting-desc.c:4879
+#: ../clients/common/nm-meta-setting-desc.c:4135
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP キーインデックスは '%d' に設定されます"
 
-#: ../clients/common/nm-meta-setting-desc.c:4918
+#: ../clients/common/nm-meta-setting-desc.c:4174
 #, 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:4928
-#, c-format
-msgid "'%s' is not a valid PSK"
-msgstr "'%s' は有効な PSK ではありません"
-
-#: ../clients/common/nm-meta-setting-desc.c:4980
+#: ../clients/common/nm-meta-setting-desc.c:4231
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "'%s' は無効です; 'on'、'off'、または 'ignore' を使用してください"
 
-#: ../clients/common/nm-meta-setting-desc.c:5039
+#: ../clients/common/nm-meta-setting-desc.c:4291
 msgid "Bonding primary interface [none]"
 msgstr "ボンドのプライマリインターフェース [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:5046
+#: ../clients/common/nm-meta-setting-desc.c:4298
 msgid "Bonding monitoring mode"
 msgstr "ボンディングモニタリングモード"
 
-#: ../clients/common/nm-meta-setting-desc.c:5055
+#: ../clients/common/nm-meta-setting-desc.c:4307
 msgid "Bonding miimon [100]"
 msgstr "ボンドの miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5063
+#: ../clients/common/nm-meta-setting-desc.c:4315
 msgid "Bonding downdelay [0]"
 msgstr "ボンドの downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5071
+#: ../clients/common/nm-meta-setting-desc.c:4323
 msgid "Bonding updelay [0]"
 msgstr "ボンドの updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5079
+#: ../clients/common/nm-meta-setting-desc.c:4331
 msgid "Bonding arp-interval [0]"
 msgstr "ボンドの arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5087
+#: ../clients/common/nm-meta-setting-desc.c:4339
 msgid "Bonding arp-ip-target [none]"
 msgstr "ボンドの arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5095
+#: ../clients/common/nm-meta-setting-desc.c:4347
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('slow' または 'fast') [slow]"
 
-#. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
-#. * 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:5212
+#: ../clients/common/nm-meta-setting-desc.c:4512
 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 "
@@ -5079,7 +4884,7 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5220
+#: ../clients/common/nm-meta-setting-desc.c:4520
 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 "
@@ -5128,7 +4933,11 @@ 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:5270
+#: ../clients/common/nm-meta-setting-desc.c:4553
+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:4586
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5142,7 +4951,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5304
+#: ../clients/common/nm-meta-setting-desc.c:4625
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5156,7 +4965,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5361
+#: ../clients/common/nm-meta-setting-desc.c:4682
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5173,7 +4982,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5396
+#: ../clients/common/nm-meta-setting-desc.c:4722
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5190,7 +4999,7 @@ msgstr ""
 "い。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5423
+#: ../clients/common/nm-meta-setting-desc.c:4749
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5211,8 +5020,8 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5440
-#: ../clients/common/nm-meta-setting-desc.c:5458
+#: ../clients/common/nm-meta-setting-desc.c:4766
+#: ../clients/common/nm-meta-setting-desc.c:4784
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5226,84 +5035,84 @@ msgstr ""
 "してください。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../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/common/nm-meta-setting-desc.c:4823
+#: ../clients/common/nm-secret-agent-simple.c:281
+#: ../clients/common/nm-secret-agent-simple.c:369
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../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
+#: ../clients/common/nm-meta-setting-desc.c:4829
+#: ../clients/common/nm-meta-setting-desc.c:5044
+#: ../clients/common/nm-meta-setting-desc.c:5434
+#: ../clients/common/nm-meta-setting-desc.c:6339
 msgid "Password [none]"
 msgstr "パスワード [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5549
+#: ../clients/common/nm-meta-setting-desc.c:4875
 msgid "Bluetooth device address"
 msgstr "Bluetooth デバイスアドレス"
 
-#: ../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:7484
-#: ../clients/common/nm-meta-setting-desc.c:7621
-#: ../clients/common/nm-meta-setting-desc.c:7839
+#: ../clients/common/nm-meta-setting-desc.c:4923
+#: ../clients/common/nm-meta-setting-desc.c:5487
+#: ../clients/common/nm-meta-setting-desc.c:6994
+#: ../clients/common/nm-meta-setting-desc.c:7032
+#: ../clients/common/nm-meta-setting-desc.c:7207
+#: ../clients/common/nm-meta-setting-desc.c:7437
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5600
+#: ../clients/common/nm-meta-setting-desc.c:4929
 msgid "Enable STP [no]"
 msgstr "STP の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5606
+#: ../clients/common/nm-meta-setting-desc.c:4935
 msgid "STP priority [32768]"
 msgstr "STP の優先度 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5612
+#: ../clients/common/nm-meta-setting-desc.c:4941
 msgid "Forward delay [15]"
 msgstr "フォワード遅延 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5618
+#: ../clients/common/nm-meta-setting-desc.c:4947
 msgid "Hello time [2]"
 msgstr "Hello タイム [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5624
+#: ../clients/common/nm-meta-setting-desc.c:4953
 msgid "Max age [20]"
 msgstr "最大エイジ [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5630
+#: ../clients/common/nm-meta-setting-desc.c:4959
 msgid "MAC address ageing time [300]"
 msgstr "MAC アドレスのエージングタイム [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5636
+#: ../clients/common/nm-meta-setting-desc.c:4965
 msgid "Group forward mask [0]"
 msgstr "グループの前方マスク [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5642
+#: ../clients/common/nm-meta-setting-desc.c:4971
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP スヌーピングの有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5654
+#: ../clients/common/nm-meta-setting-desc.c:5000
 msgid "Bridge port priority [32]"
 msgstr "ブリッジポートの優先度 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5660
+#: ../clients/common/nm-meta-setting-desc.c:5006
 msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジポートの STP パスコスト [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5666
+#: ../clients/common/nm-meta-setting-desc.c:5012
 msgid "Hairpin [no]"
 msgstr "ヘアピン [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5681
-#: ../clients/common/nm-meta-setting-desc.c:6054
-#: ../clients/common/nm-meta-setting-desc.c:7336
+#: ../clients/common/nm-meta-setting-desc.c:5038
+#: ../clients/common/nm-meta-setting-desc.c:5428
+#: ../clients/common/nm-meta-setting-desc.c:6852
 msgid "Username [none]"
 msgstr "ユーザー名 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5784
+#: ../clients/common/nm-meta-setting-desc.c:5141
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5318,7 +5127,7 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5826
+#: ../clients/common/nm-meta-setting-desc.c:5193
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5340,7 +5149,7 @@ msgstr ""
 "\n"
 "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5843
+#: ../clients/common/nm-meta-setting-desc.c:5216
 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"
@@ -5355,25 +5164,25 @@ msgstr ""
 "NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
 "'unknown'\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6071
+#: ../clients/common/nm-meta-setting-desc.c:5444
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6123
-#: ../clients/common/nm-meta-setting-desc.c:7509
-#: ../clients/common/nm-meta-setting-desc.c:7655
+#: ../clients/common/nm-meta-setting-desc.c:5496
+#: ../clients/common/nm-meta-setting-desc.c:7063
+#: ../clients/common/nm-meta-setting-desc.c:7247
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6142
+#: ../clients/common/nm-meta-setting-desc.c:5515
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6151
+#: ../clients/common/nm-meta-setting-desc.c:5524
 msgid "Parent interface [none]"
 msgstr "親インターフェース [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6174
+#: ../clients/common/nm-meta-setting-desc.c:5551
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5383,11 +5192,11 @@ msgstr ""
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6206
+#: ../clients/common/nm-meta-setting-desc.c:5599
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6208
+#: ../clients/common/nm-meta-setting-desc.c:5601
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5401,11 +5210,11 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6221
+#: ../clients/common/nm-meta-setting-desc.c:5620
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6229
+#: ../clients/common/nm-meta-setting-desc.c:5628
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5428,7 +5237,17 @@ 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:6331
+#: ../clients/common/nm-meta-setting-desc.c:5668
+msgid ""
+"Enter a list of IPv4 routing rules formatted as:\n"
+"  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
+msgstr ""
+"次のような形式で IPv4 ルーティングルールの一覧を入力してください:\n"
+"  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
+
+#: ../clients/common/nm-meta-setting-desc.c:5758
 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 "
@@ -5447,11 +5266,11 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6369
+#: ../clients/common/nm-meta-setting-desc.c:5812
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6371
+#: ../clients/common/nm-meta-setting-desc.c:5814
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5465,11 +5284,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:6384
+#: ../clients/common/nm-meta-setting-desc.c:5833
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6392
+#: ../clients/common/nm-meta-setting-desc.c:5841
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5494,172 +5313,186 @@ msgstr ""
 "beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6497
-#: ../clients/common/nm-meta-setting-desc.c:7369
+#: ../clients/common/nm-meta-setting-desc.c:5881
+msgid ""
+"Enter a list of IPv6 routing rules formatted as:\n"
+"  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
+msgstr ""
+"次のような形式で IPv6 ルーティングルールの一覧を入力してください:\n"
+"  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
+
+#: ../clients/common/nm-meta-setting-desc.c:5969
+#: ../clients/common/nm-meta-setting-desc.c:6893
 msgid "Parent device [none]"
 msgstr "親デバイス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6503
+#: ../clients/common/nm-meta-setting-desc.c:5975
 msgid "Local endpoint [none]"
 msgstr "ローカルエンドポイント [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6510
-#: ../clients/common/nm-meta-setting-desc.c:7389
+#: ../clients/common/nm-meta-setting-desc.c:5982
+#: ../clients/common/nm-meta-setting-desc.c:6913
 msgid "Remote"
 msgstr "リモート"
 
-#: ../clients/common/nm-meta-setting-desc.c:6555
+#: ../clients/common/nm-meta-setting-desc.c:6027
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6576
+#: ../clients/common/nm-meta-setting-desc.c:6048
 msgid "Enable encryption [yes]"
 msgstr "暗号化の有効化 [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6582
-#: ../clients/common/nm-secret-agent-simple.c:835
+#: ../clients/common/nm-meta-setting-desc.c:6054
+#: ../clients/common/nm-secret-agent-simple.c:930
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6592
+#: ../clients/common/nm-meta-setting-desc.c:6064
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6598
+#: ../clients/common/nm-meta-setting-desc.c:6070
 msgid "SCI port [1]"
 msgstr "SCI ポート [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6624
+#: ../clients/common/nm-meta-setting-desc.c:6096
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6645
+#: ../clients/common/nm-meta-setting-desc.c:6117
 msgid "Tap [no]"
 msgstr "Tap [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6671
-#: ../clients/common/nm-meta-setting-desc.c:7576
+#: ../clients/common/nm-meta-setting-desc.c:6152
+#: ../clients/common/nm-meta-setting-desc.c:7162
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6680
+#: ../clients/common/nm-meta-setting-desc.c:6161
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュチャンネル [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6689
+#: ../clients/common/nm-meta-setting-desc.c:6170
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6701
+#: ../clients/common/nm-meta-setting-desc.c:6320
 msgid "PPPoE parent device"
 msgstr "PPPoE 親デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:6707
+#: ../clients/common/nm-meta-setting-desc.c:6326
 msgid "Service [none]"
 msgstr "サービス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6714
+#: ../clients/common/nm-meta-setting-desc.c:6333
 msgid "PPPoE username"
 msgstr "PPPoE ユーザー名"
 
-#: ../clients/common/nm-meta-setting-desc.c:6888
+#: ../clients/common/nm-meta-setting-desc.c:6369
 msgid "Browser only [no]"
 msgstr "ブラウザー専用 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6894
+#: ../clients/common/nm-meta-setting-desc.c:6375
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../clients/common/nm-meta-setting-desc.c:6900
+#: ../clients/common/nm-meta-setting-desc.c:6381
 msgid "PAC script"
 msgstr "PAC スクリプト"
 
-#: ../clients/common/nm-meta-setting-desc.c:6935
-#: ../clients/common/nm-meta-setting-desc.c:7084
+#: ../clients/common/nm-meta-setting-desc.c:6505
+#: ../clients/common/nm-meta-setting-desc.c:6667
 msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7239
+#: ../clients/common/nm-meta-setting-desc.c:6755
 msgid "User ID [none]"
 msgstr "ユーザー ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7245
+#: ../clients/common/nm-meta-setting-desc.c:6761
 msgid "Group ID [none]"
 msgstr "グループ ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7251
+#: ../clients/common/nm-meta-setting-desc.c:6767
 msgid "Enable PI [no]"
 msgstr "PI の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7257
+#: ../clients/common/nm-meta-setting-desc.c:6773
 msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー の有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7263
+#: ../clients/common/nm-meta-setting-desc.c:6779
 msgid "Enable multi queue [no]"
 msgstr "複数のキューの有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7276
+#: ../clients/common/nm-meta-setting-desc.c:6792
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 親デバイスまたは接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7283
+#: ../clients/common/nm-meta-setting-desc.c:6799
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7289
+#: ../clients/common/nm-meta-setting-desc.c:6805
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7298
+#: ../clients/common/nm-meta-setting-desc.c:6814
 msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7308
+#: ../clients/common/nm-meta-setting-desc.c:6824
 msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7376
+#: ../clients/common/nm-meta-setting-desc.c:6900
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:7382
+#: ../clients/common/nm-meta-setting-desc.c:6906
 msgid "Local address [none]"
 msgstr "ローカルアドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7395
+#: ../clients/common/nm-meta-setting-desc.c:6919
 msgid "Minimum source port [0]"
 msgstr "最小ソースポート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7401
+#: ../clients/common/nm-meta-setting-desc.c:6925
 msgid "Maximum source port [0]"
 msgstr "最大ソースポート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7407
+#: ../clients/common/nm-meta-setting-desc.c:6931
 msgid "Destination port [8472]"
 msgstr "接続先ポート [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7453
+#: ../clients/common/nm-meta-setting-desc.c:6971
+msgid "Peer"
+msgstr "ピア"
+
+#: ../clients/common/nm-meta-setting-desc.c:7001
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP 名"
 
-#: ../clients/common/nm-meta-setting-desc.c:7490
-#: ../clients/common/nm-meta-setting-desc.c:7626
+#: ../clients/common/nm-meta-setting-desc.c:7038
+#: ../clients/common/nm-meta-setting-desc.c:7212
 msgid "Cloned MAC [none]"
 msgstr "クローンした MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7517
+#: ../clients/common/nm-meta-setting-desc.c:7071
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
-"サブチャネルの一覧を入力します (カンマまたはスペースで区切ります)。\n"
+"サブチャネルの一覧を入力します (コンマまたはスペースで区切ります)。\n"
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7785
+#: ../clients/common/nm-meta-setting-desc.c:7386
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5667,264 +5500,281 @@ msgstr ""
 "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
 "key、2 または passphrase です。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7847
+#: ../clients/common/nm-meta-setting-desc.c:7445
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "ショートアドレス (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7863
+#: ../clients/common/nm-meta-setting-desc.c:7461
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "PAN 識別子 (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7878
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7476
 msgid "Page (<default|0-31>)"
-msgstr "(デフォルト)"
+msgstr "ページ (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7892
+#: ../clients/common/nm-meta-setting-desc.c:7490
 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"
+msgstr "チャンネル (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:8040
+#: ../clients/common/nm-meta-setting-desc.c:7625
+msgid "6LOWPAN settings"
+msgstr "6LOWPAN 設定"
+
+#: ../clients/common/nm-meta-setting-desc.c:7626
 msgid "802-1x settings"
 msgstr "802-1x 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8041
-#: ../src/devices/adsl/nm-device-adsl.c:133
+#: ../clients/common/nm-meta-setting-desc.c:7627
+#: ../src/devices/adsl/nm-device-adsl.c:132
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8042
+#: ../clients/common/nm-meta-setting-desc.c:7628
 msgid "bluetooth connection"
 msgstr "bluetooth 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8043
+#: ../clients/common/nm-meta-setting-desc.c:7629
 msgid "Bond device"
 msgstr "Bond デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8044
+#: ../clients/common/nm-meta-setting-desc.c:7630
 msgid "Bridge device"
 msgstr "ブリッジデバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8045
+#: ../clients/common/nm-meta-setting-desc.c:7631
 msgid "Bridge port"
 msgstr "ブリッジポート"
 
-#: ../clients/common/nm-meta-setting-desc.c:8046
+#: ../clients/common/nm-meta-setting-desc.c:7632
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA モバイルブロードバンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8047
+#: ../clients/common/nm-meta-setting-desc.c:7633
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8048
+#: ../clients/common/nm-meta-setting-desc.c:7634
 msgid "DCB settings"
 msgstr "DCB 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8049
+#: ../clients/common/nm-meta-setting-desc.c:7635
 msgid "Dummy settings"
 msgstr "ダミー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8050
+#: ../clients/common/nm-meta-setting-desc.c:7636
 msgid "Ethtool settings"
 msgstr "Ethtool 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8051
+#: ../clients/common/nm-meta-setting-desc.c:7637
 msgid "Generic settings"
 msgstr "汎用設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8052
+#: ../clients/common/nm-meta-setting-desc.c:7638
 msgid "GSM mobile broadband connection"
 msgstr "GSM モバイルブロードバンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8053
+#: ../clients/common/nm-meta-setting-desc.c:7639
 #: ../src/devices/nm-device-infiniband.c:172
 msgid "InfiniBand connection"
 msgstr "InfiniBand 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8054
+#: ../clients/common/nm-meta-setting-desc.c:7640
 msgid "IPv4 protocol"
 msgstr "IPv4 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:8055
+#: ../clients/common/nm-meta-setting-desc.c:7641
 msgid "IPv6 protocol"
 msgstr "IPv6 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:8056
+#: ../clients/common/nm-meta-setting-desc.c:7642
 msgid "IP-tunnel settings"
 msgstr "IP トンネル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8057
+#: ../clients/common/nm-meta-setting-desc.c:7643
 msgid "MACsec connection"
 msgstr "MACsec 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8058
+#: ../clients/common/nm-meta-setting-desc.c:7644
 msgid "macvlan connection"
 msgstr "macvlan 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8059
+#: ../clients/common/nm-meta-setting-desc.c:7645
 msgid "Match"
 msgstr "一致"
 
-#: ../clients/common/nm-meta-setting-desc.c:8060
+#: ../clients/common/nm-meta-setting-desc.c:7646
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8061
+#: ../clients/common/nm-meta-setting-desc.c:7647
 msgid "Open vSwitch bridge settings"
 msgstr "Open vSwitch ブリッジ設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8062
+#: ../clients/common/nm-meta-setting-desc.c:7648
 msgid "Open vSwitch interface settings"
 msgstr "Open vSwitch インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8063
+#: ../clients/common/nm-meta-setting-desc.c:7649
 msgid "Open vSwitch patch interface settings"
 msgstr "Open vSwitch パッチインターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8064
+#: ../clients/common/nm-meta-setting-desc.c:7650
 msgid "Open vSwitch port settings"
 msgstr "Open vSwitch ポート設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8065
+#: ../clients/common/nm-meta-setting-desc.c:7651
 msgid "PPP settings"
 msgstr "PPP 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8066
+#: ../clients/common/nm-meta-setting-desc.c:7652
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:8067
+#: ../clients/common/nm-meta-setting-desc.c:7653
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../clients/common/nm-meta-setting-desc.c:8068
+#: ../clients/common/nm-meta-setting-desc.c:7654
 msgid "Serial settings"
 msgstr "シリアル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8069
+#: ../clients/common/nm-meta-setting-desc.c:7655
 msgid "SR-IOV settings"
 msgstr "SR-IOV 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8070
+#: ../clients/common/nm-meta-setting-desc.c:7656
 msgid "Traffic controls"
 msgstr "トラフィックコントロール"
 
-#: ../clients/common/nm-meta-setting-desc.c:8071
+#: ../clients/common/nm-meta-setting-desc.c:7657
 msgid "Team device"
 msgstr "Team デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8072
+#: ../clients/common/nm-meta-setting-desc.c:7658
 msgid "Team port"
 msgstr "Team ポート"
 
-#: ../clients/common/nm-meta-setting-desc.c:8073
+#: ../clients/common/nm-meta-setting-desc.c:7659
 msgid "Tun device"
 msgstr "TUN デバイス"
 
-#: ../clients/common/nm-meta-setting-desc.c:8074
+#: ../clients/common/nm-meta-setting-desc.c:7660
 msgid "User settings"
 msgstr "ユーザー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8075
+#: ../clients/common/nm-meta-setting-desc.c:7661
 #: ../src/devices/nm-device-vlan.c:400
 msgid "VLAN connection"
 msgstr "VLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488
+#: ../clients/common/nm-meta-setting-desc.c:7662 ../src/nm-manager.c:5518
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8077
-#: ../src/devices/nm-device-vxlan.c:371
+#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../src/devices/nm-device-vxlan.c:369
 msgid "VXLAN connection"
 msgstr "VXLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8078
+#: ../clients/common/nm-meta-setting-desc.c:7664
+msgid "Wi-Fi P2P connection"
+msgstr "Wi-Fi P2P 接続"
+
+#: ../clients/common/nm-meta-setting-desc.c:7665
 msgid "WiMAX connection"
 msgstr "WiMAX 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8079
+#: ../clients/common/nm-meta-setting-desc.c:7666
 msgid "Wired Ethernet"
 msgstr "有線 Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:8080
+#: ../clients/common/nm-meta-setting-desc.c:7667
+msgid "WireGuard VPN settings"
+msgstr "WireGuard VPN 設定"
+
+#: ../clients/common/nm-meta-setting-desc.c:7668
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:8081
+#: ../clients/common/nm-meta-setting-desc.c:7669
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi セキュリティー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8082
+#: ../clients/common/nm-meta-setting-desc.c:7670
 msgid "WPAN settings"
 msgstr "WPAN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8083
-msgid "6LOWPAN settings"
-msgstr "6LOWPAN 設定"
-
-#: ../clients/common/nm-meta-setting-desc.c:8434
+#: ../clients/common/nm-meta-setting-desc.c:8033
 msgid "name"
 msgstr "名前"
 
-#: ../clients/common/nm-polkit-listener.c:239
+#: ../clients/common/nm-polkit-listener.c:238
 msgid "An authentication session is already underway."
 msgstr "認証セッションはすでに実行されています。"
 
-#: ../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-secret-agent-simple.c:230
+#, c-format
+msgid "Preshared-key for %s"
+msgstr "%s の共有前のキー"
+
+#: ../clients/common/nm-secret-agent-simple.c:286
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/common/nm-secret-agent-simple.c:346
+#: ../clients/common/nm-secret-agent-simple.c:379
+#: ../clients/common/nm-secret-agent-simple.c:916
+#: ../clients/common/nm-secret-agent-simple.c:951
+#: ../clients/common/nm-secret-agent-simple.c:974
 #: ../clients/common/nm-vpn-helpers.c:123
-#: ../clients/common/nm-vpn-helpers.c:129
-#: ../clients/common/nm-vpn-helpers.c:134 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:127
+#: ../clients/common/nm-vpn-helpers.c:133
+#: ../clients/common/nm-vpn-helpers.c:138 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
 msgstr "パスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:281
+#: ../clients/common/nm-secret-agent-simple.c:295
 msgid "Identity"
 msgstr "ID"
 
-#: ../clients/common/nm-secret-agent-simple.c:287
+#: ../clients/common/nm-secret-agent-simple.c:300
 msgid "Private key password"
 msgstr "プライベートキーのパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:326
+#: ../clients/common/nm-secret-agent-simple.c:336
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "キー"
 
-#: ../clients/common/nm-secret-agent-simple.c:369
+#: ../clients/common/nm-secret-agent-simple.c:374
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "サービス"
 
-#: ../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
+#: ../clients/common/nm-secret-agent-simple.c:486
+msgid "WireGuard private-key"
+msgstr "WireGuard プライベートキー"
+
+#: ../clients/common/nm-secret-agent-simple.c:527
+#, c-format
+msgid "Secrets are required to connect WireGuard VPN '%s'"
+msgstr "WireGuard VPN '%s' の接続にはシークレットが必要です"
+
+#: ../clients/common/nm-secret-agent-simple.c:628
+#: ../clients/common/nm-secret-agent-simple.c:912
+#: ../clients/common/nm-secret-agent-simple.c:947
+#: ../clients/common/nm-secret-agent-simple.c:970
+#: ../clients/common/nm-secret-agent-simple.c:989
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
-#: ../clients/common/nm-secret-agent-simple.c:785
+#: ../clients/common/nm-secret-agent-simple.c:879
 msgid "Authentication required by wireless network"
 msgstr "ワイヤレスネットワークで必要とされる認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:786
+#: ../clients/common/nm-secret-agent-simple.c:880
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -5933,70 +5783,74 @@ msgstr ""
 "ワイヤレスネットワーク '%s' へのアクセスには、パスワードまたは暗号キーが必要"
 "です。"
 
-#: ../clients/common/nm-secret-agent-simple.c:790
+#: ../clients/common/nm-secret-agent-simple.c:885
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X の認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:791
+#: ../clients/common/nm-secret-agent-simple.c:886
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:796
+#: ../clients/common/nm-secret-agent-simple.c:892
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:797
+#: ../clients/common/nm-secret-agent-simple.c:893
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "DSL 接続 '%s' にはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:805
+#: ../clients/common/nm-secret-agent-simple.c:902
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:806
+#: ../clients/common/nm-secret-agent-simple.c:903
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドのデバイスには PIN コードが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:809
+#: ../clients/common/nm-secret-agent-simple.c:906
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:815
-#: ../clients/common/nm-secret-agent-simple.c:847
-#: ../clients/common/nm-secret-agent-simple.c:869
+#: ../clients/common/nm-secret-agent-simple.c:911
+#: ../clients/common/nm-secret-agent-simple.c:946
+#: ../clients/common/nm-secret-agent-simple.c:969
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドのネットワークパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:829
+#: ../clients/common/nm-secret-agent-simple.c:924
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "MACsec ネットワーク '%s' へのアクセスにはシークレットが必要です"
 
-#: ../clients/common/nm-secret-agent-simple.c:833
+#: ../clients/common/nm-secret-agent-simple.c:928
 msgid "MACsec PSK authentication"
 msgstr "MACsec PSK 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:841
+#: ../clients/common/nm-secret-agent-simple.c:935
 msgid "MACsec EAP authentication"
 msgstr "MACsec EAP 認証"
 
-#: ../clients/common/nm-secret-agent-simple.c:882
+#: ../clients/common/nm-secret-agent-simple.c:940
+msgid "WireGuard VPN secret"
+msgstr "WireGuard VPN シークレット"
+
+#: ../clients/common/nm-secret-agent-simple.c:979
 msgid "VPN password required"
 msgstr "VPN パスワードが必要です"
 
-#: ../clients/common/nm-vpn-helpers.c:48
+#: ../clients/common/nm-vpn-helpers.c:52
 #, c-format
 msgid "unknown VPN plugin \"%s\""
 msgstr "不明な VPN プラグイン '%s'"
 
-#: ../clients/common/nm-vpn-helpers.c:59
+#: ../clients/common/nm-vpn-helpers.c:63
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
 msgstr "'%s' 向けレガシー専用 VPN プラグイン '%s' を読み込めません"
 
-#: ../clients/common/nm-vpn-helpers.c:64
+#: ../clients/common/nm-vpn-helpers.c:68
 #, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
@@ -6004,37 +5858,70 @@ msgstr ""
 "'%s' がないため VPN プラグイン '%s' を読み込めません。クライアントプラグイン"
 "がありませんか?"
 
-#: ../clients/common/nm-vpn-helpers.c:69
+#: ../clients/common/nm-vpn-helpers.c:73
 #, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
 msgstr "VPN プラグイン '%s' の読み込みに失敗しました: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:124
+#: ../clients/common/nm-vpn-helpers.c:128
 msgid "Certificate password"
 msgstr "証明書のパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:125
+#: ../clients/common/nm-vpn-helpers.c:129
 msgid "HTTP proxy password"
 msgstr "HTTP プロキシのパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:130
-#: ../clients/common/nm-vpn-helpers.c:135
+#: ../clients/common/nm-vpn-helpers.c:134
+#: ../clients/common/nm-vpn-helpers.c:139
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:139 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:143 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../clients/common/nm-vpn-helpers.c:140
+#: ../clients/common/nm-vpn-helpers.c:144
 msgid "Cookie"
 msgstr "クッキー"
 
-#: ../clients/common/nm-vpn-helpers.c:141
+#: ../clients/common/nm-vpn-helpers.c:145
 msgid "Gateway certificate hash"
 msgstr "ゲートウェイ証明書ハッシュ"
 
+#: ../clients/common/nm-vpn-helpers.c:270
+#, c-format
+msgid "Invalid peer starting at %s:%zu: %s"
+msgstr "%s:%zu で始まる無効なピア: %s"
+
+#: ../clients/common/nm-vpn-helpers.c:390
+msgid ""
+"The WireGuard config file must be a valid interface name followed by \".conf"
+"\""
+msgstr ""
+"WireGuard 設定ファイルは、\".conf\" があとに続く有効なインターフェース名でな"
+"ければなりません"
+
+#: ../clients/common/nm-vpn-helpers.c:678
+#, c-format
+msgid "unrecognized line at %s:%zu"
+msgstr "%s:%zu に未認識の行があります"
+
+#: ../clients/common/nm-vpn-helpers.c:683
+#, c-format
+msgid "invalid value for '%s' at %s:%zu"
+msgstr "%s:%zu における '%s' の値は無効です"
+
+#: ../clients/common/nm-vpn-helpers.c:688
+#, c-format
+msgid "invalid secret '%s' at %s:%zu"
+msgstr "%s:%zu のシークレット '%s' は無効です"
+
+#: ../clients/common/nm-vpn-helpers.c:801
+#, c-format
+msgid "Failed to create WireGuard connection: %s"
+msgstr "WireGuard 接続の作成に失敗しました: %s"
+
 #. Generated file. Do not edit.
 #: ../clients/common/settings-docs.h.in:3
 msgid ""
@@ -6117,19 +6004,18 @@ msgid ""
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
 msgstr ""
-"指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
-"これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
-"MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random"
-"\"、\"stable\" の特別値がサポートされます。\"preserve\" では、アクティベー"
-"ション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化"
-"ハードウェアアドレスを使用します。\"random\" では、各接続にランダムの MAC ア"
-"ドレスを作成します。\"stable\" では、connection.stable-id と機種依存キーに基"
-"づいて、ハッシュ化した MAC アドレスを作成します。指定しない場合は、その値はグ"
-"ローバルのデフォルトにより上書きされます。NetworkManager.conf を参照してくだ"
-"さい。それでも指定しない場合は、デフォルトの \"preserve\" が設定されます "
-"(NetworkManager の旧バージョンは別のデフォルト値を使用するかもしれません)。D-"
-"Bus において、このフィールドは \"assigned-mac-address\" または廃止予定の "
-"\"cloned-mac-address\" として表示されます。"
+"これを指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC "
+"アドレスを使用する必要があります。これは、MAC クローニングまたはスプーフィン"
+"グとして知られています。明示的に MAC アドレスを指定する以外に、\"preserve"
+"\"、\"permanent\"、\"random\"、\"stable\" の値がサポートされます。\"preserve"
+"\" では、アクティベーション時に MAC アドレスを変更しません。\"permanent\" で"
+"は、デバイスに永続化ハードウェアアドレスを使用します。\"random\" では、各接続"
+"にランダムの MAC アドレスを作成します。\"stable\" では、connection.stable-id "
+"と機種依存キーに基づいて、ハッシュ化した MAC アドレスを作成します。指定しない"
+"場合、その値はグローバルのデフォルトにより上書きされます。NetworkManager."
+"conf を参照してください。それでも指定しない場合は、デフォルトの \"permanent"
+"\" が設定されます。D-Bus において、このフィールドは \"assigned-mac-address\" "
+"または廃止予定の \"cloned-mac-address\" として表示されます。"
 
 #: ../clients/common/settings-docs.h.in:11
 #: ../clients/common/settings-docs.h.in:91
@@ -6391,13 +6277,14 @@ msgstr ""
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
-"WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for "
-"any Wi-Fi connection that uses security."
+"WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must "
+"be set for any Wi-Fi connection that uses security."
 msgstr ""
 "接続に使用するキー管理。\"none\" (WEP)、\"ieee8021x\" (Dynamic WEP)、\"wpa-"
-"none\" (Ad-Hoc WPA-PSK)、\"wpa-psk\" (インフラストラクチャー WPA-PSK)、また"
-"は \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパティーは、セ"
-"キュリティーを使用するすべての Wi-Fi 接続に設定する必要があります。"
+"none\" (Ad-Hoc WPA-PSK)、\"wpa-psk\" (インフラストラクチャー WPA-PSK)、\"sae"
+"\" (SAE) または \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパ"
+"ティーは、セキュリティーを使用するすべての Wi-Fi 接続に設定する必要がありま"
+"す。"
 
 #: ../clients/common/settings-docs.h.in:28
 msgid ""
@@ -6464,18 +6351,16 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:34
 msgid ""
-"Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
-"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
-"key.  Otherwise, the key must be between 8 and 63 ASCII characters (as "
-"specified in the 802.11i standard) and is interpreted as a WPA passphrase, "
-"and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
-"network."
-msgstr ""
-"WPA ネットワークの共有前のキー。このキーを 64 文字の長さにする場合は、16 進数"
-"の文字でなければならず、16 進数の WPA キーとして解釈されません。それ以外で"
-"は、キーは、(802.11i 仕様で指定されているように) 8 文字から 63 文字の ASCII "
-"文字にする必要があり、WPA パスフレーズとして解釈されます。接続が Wi-Fi ネット"
-"ワークに接続する際に使用される実際の WPA-PSK を取得するためにハッシュ化されま"
+"Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII "
+"passphrase of 8 to 63 characters that is (as specified in the 802.11i "
+"standard) hashed to derive the actual key, or the key in form of 64 "
+"hexadecimal character. The WPA3-Personal networks use a passphrase of any "
+"length for SAE authentication."
+msgstr ""
+"WPA ネットワークの共有前のキー。WPA-PSK では、実際のキーを取得するために "
+"(802.11i 仕様で指定されているように) ハッシュ化された 8 文字から 63 文字の "
+"ASCII パスフレーズか、16 進数の文字形式のキーのいずれかになります。WPA3-"
+"Personal ネットワークは、SAE の認証に文字数に制限のないパスフレーズを使用しま"
 "す。"
 
 #: ../clients/common/settings-docs.h.in:35
@@ -6721,9 +6606,9 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:59
 #: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:127
-#: ../clients/common/settings-docs.h.in:174
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:290
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "\"password\" プロパティーの処理方法を示すフラグ。"
 
@@ -7014,7 +6899,7 @@ msgid "PIN used for EAP authentication methods."
 msgstr "EAP 認証方法に使用される PIN"
 
 #: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:180
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "\"pin\" プロパティーの処理方法を示すフラグ。"
 
@@ -7139,20 +7024,19 @@ msgid ""
 "D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
 msgstr ""
-"指定した場合は、デバイスがこの MAC アドレスを代わりに使用するよう要求します。"
-"これは、MAC クローニングまたはスプーフィングとして知られています。明示的に "
-"MAC アドレスを指定する以外に、\"preserve\"、\"permanent\"、\"random"
-"\"、\"stable\" の特別値がサポートされます。\"preserve\" では、アクティベー"
-"ション時に MAC アドレスを変更しません。\"permanent\" では、デバイスに永続化"
-"ハードウェアアドレスがある場合はそれを使用します (ない場合は \"preserve\" と"
-"同じ扱いとなります)。\"random\" では、各接続にランダムの MAC アドレスを作成し"
-"ます。\"stable\" では、connection.stable-id と機種依存キーに基づいて、ハッ"
-"シュ化した MAC アドレスを作成します。指定しない場合は、その値はグローバルのデ"
-"フォルトにより上書きされます。NetworkManager.conf を参照してください。それで"
-"も指定しない場合は、デフォルトで \"preserve\" が設定されます (NetworkManager "
-"の旧バージョンは別のデフォルト値を使用するかもしれません)。D-Bus において、こ"
-"のフィールドは \"assigned-mac-address\" または廃止予定の \"cloned-mac-address"
-"\" として表示されます。"
+"指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC アドレ"
+"スを使用する必要があります。これは、MAC クローニングまたはスプーフィングとし"
+"て知られています。明示的に MAC アドレスを指定する以外に、\"preserve"
+"\"、\"permanent\"、\"random\"、\"stable\" の値がサポートされます。\"preserve"
+"\" では、アクティベーション時に MAC アドレスを変更しません。\"permanent\" で"
+"は、デバイスに永続化ハードウェアアドレスがある場合にそれを使用します (アドレ"
+"スがない場合は \"preserve\" と同じ)。\"random\" では、各接続に対してランダム"
+"の MAC アドレスを作成します。\"stable\" では、connection.stable-id と機種依存"
+"キーに基づいて、ハッシュ化した MAC アドレスを作成します。指定しないと、その値"
+"はグローバルのデフォルトにより上書きされます。NetworkManager.conf を参照して"
+"ください。それでも指定しない場合は、デフォルトの \"permanent\" が設定されま"
+"す。D-Bus において、このフィールドは \"assigned-mac-address\" または廃止予定"
+"の \"cloned-mac-address\" として表示されます。"
 
 #: ../clients/common/settings-docs.h.in:90
 msgid ""
@@ -7430,25 +7314,69 @@ msgstr ""
 
 #: ../clients/common/settings-docs.h.in:121
 msgid ""
+"The default PVID for the ports of the bridge, that is the VLAN id assigned "
+"to incoming untagged frames."
+msgstr ""
+"ブリッジのポート向けデフォルトの PVID です。これは、受信したタグなしフレーム"
+"に割り当てられた VLAN ID です。"
+
+#: ../clients/common/settings-docs.h.in:122
+msgid "Control whether VLAN filtering is enabled on the bridge."
+msgstr "このブリッジにおいて、VLAN フィルタリングが有効かどうかを制御します。"
+
+#: ../clients/common/settings-docs.h.in:123
+msgid ""
+"Array of bridge VLAN objects. In addition to the VLANs specified here, the "
+"bridge will also have the default-pvid VLAN configured  by the bridge.vlan-"
+"default-pvid property. In nmcli the VLAN list can be specified with the "
+"following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where "
+"$vid is either a single id between 1 and 4094 or a range, represented as a "
+"couple of ids separated by a dash."
+msgstr ""
+"ブリッジ VLAN オブジェクトの配列。ここで指定された VLAN のほかに、ブリッジに"
+"は、bridge.vlan-default-pvid プロパティーによって設定された default-pvid "
+"VLAN もあります。nmcli では、VLAN のリストは以下の構文で指定できます: $vid "
+"[pvid] [untagged] [, $vid [pvid] [untagged]]...。ここでの $vid は、1 から "
+"4094 の間の単一 ID または範囲のいずれかとなり、ダッシュで区切られた複数の ID "
+"で表されます。"
+
+#: ../clients/common/settings-docs.h.in:124
+msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
 msgstr ""
 "ポートの \"hairpin mode\" を有効または無効にします。このモードでは、フレーム"
 "を受け取ったポートからフレームを送り戻すことができます。"
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.h.in:125
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
 "このポートを経由した、宛先のスパニングツリープロトコル (STP) ポートコスト。"
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:126
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "このブリッジポートのスパニングツリープロトコル (STP) の優先度。"
 
-#: ../clients/common/settings-docs.h.in:124
-#: ../clients/common/settings-docs.h.in:170
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:127
+msgid ""
+"Array of bridge VLAN objects. In addition to the VLANs specified here, the "
+"port will also have the default-pvid VLAN configured on the bridge by the "
+"bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified "
+"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] "
+"[untagged]]... where $vid is either a single id between 1 and 4094 or a "
+"range, represented as a couple of ids separated by a dash."
+msgstr ""
+"ブリッジ VLAN オブジェクトの配列。ここで指定された VLAN のほかに、ポートに"
+"は、bridge.vlan-default-pvid プロパティーによってブリッジに設定された "
+"default-pvid VLAN もあります。nmcli では、VLAN のリストは以下の構文で指定でき"
+"ます: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...。ここでの $vid "
+"は、1 から 4094 の間の単一 ID または範囲のいずれかとなり、ダッシュで区切られ"
+"た複数の ID で表されます。"
+
+#: ../clients/common/settings-docs.h.in:128
+#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
@@ -7456,7 +7384,7 @@ msgstr ""
 "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定したサイズよ"
 "り大きいパケットは、複数のフレームに分割されます。"
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:129
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
@@ -7466,8 +7394,8 @@ msgstr ""
 "号があれば指定します。指定しない場合は、必要に応じてデフォルトの番号 (#777) "
 "が使用されます。"
 
-#: ../clients/common/settings-docs.h.in:126
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:177
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
@@ -7477,8 +7405,8 @@ msgstr ""
 "ダーでパスワードを必要としないか、いかなるパスワードも許可されます。パスワー"
 "ドが必要な場合は、ここで指定します。"
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:179
+#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
@@ -7488,7 +7416,7 @@ msgstr ""
 "ダーでユーザー名を必要としないか、いかなるユーザー名も許可されます。ユーザー"
 "名が必要な場合は、ここで指定します。"
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:133
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -7500,7 +7428,7 @@ msgstr ""
 "は、認証を 3 回再試行したら接続に失敗します。現在、これは 802-1x 認証にのみ適"
 "用されます。"
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:134
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
@@ -7515,7 +7443,7 @@ msgstr ""
 "プロファイル を自動接続する別の方法として \"secondaries\" を参照してくださ"
 "い。"
 
-#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
@@ -7524,7 +7452,7 @@ msgstr ""
 "自動接続の優先度。接続を自動接続に設定すると、優先度の高い接続が優先されま"
 "す。デフォルトは 0 です。数値が高くなると、優先度が高くなります。"
 
-#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:136
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7537,7 +7465,7 @@ msgstr ""
 "定すると、1 度だけ有効にしてから自動接続をブロックします。タイムアウト後、"
 "NetworkManager が再度、自動接続を試行することに注意してください。"
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:137
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
@@ -7557,7 +7485,7 @@ msgstr ""
 "autoconnect-slaves が読み込まれて値が決定します。これもデフォルトに設定されて"
 "いる場合は、0 にフォールバックされます。"
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
@@ -7565,14 +7493,14 @@ msgstr ""
 "ゼロより大きくすると、タイムアウトに到達するか、IP ゲートウェイが ping に応答"
 "するまで、IP アドレスの遅延に成功します。"
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr ""
 "\"Work Wi-Fi\" や \"T-Mobile 3G\" など、人が判別できる接続の一意識別子。"
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:140
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7593,11 +7521,11 @@ msgstr ""
 "使用できるインターフェースを制限し、インターフェース名を変更したり、順番を変"
 "更すると、誤ったインターフェースに接続が適用される場合があります。"
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:141
 msgid "Whether LLDP is enabled for the connection."
 msgstr "この接続に対して LLDP が有効であるかどうか。"
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:142
 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 "
@@ -7616,12 +7544,11 @@ msgstr ""
 "に LLMNR ホスト名の解決を許可、の 3 つになります。この機能には、LLMNR をサ"
 "ポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:143
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "マスター接続のマスターデバイスまたは UUID のインターフェース名。"
 
-#: ../clients/common/settings-docs.h.in:140
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:144
 msgid ""
 "Whether mDNS is enabled for the connection. The permitted values are: yes: "
 "register hostname and resolving for the connection, no: disable mDNS for the "
@@ -7630,13 +7557,11 @@ msgid ""
 "plugin is dns-systemd-resolved."
 msgstr ""
 "mDNS の接続が実行されるかどうか。利用できる値は、yes: ホスト名を登録して接続"
-"を解決、no: インターフェースに対して mDNS を無効にする 、resolve: ホスト名を"
-"登録せずに mDNS ホスト名の解決を許可、の 3 つになります。現在有効な接続でこの"
-"プロパティーをアップデートすると、変更はすぐに有効になります。この機能には、"
-"mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved など"
-"です。"
+"を解決、no: インターフェースに対して mDNS を無効にする、resolve: ホスト名を登"
+"録せずに mDNS ホスト名の解決を許可、の 3 つになります。この機能には、mDNS を"
+"サポートするプラグインが必要です。たとえば、dns-systemd-resolved などです。"
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
@@ -7644,7 +7569,7 @@ msgstr ""
 "接続を測定するかどうか。現在有効な接続でこのプロパティーをアップデートする"
 "と、変更はすぐに有効になります。"
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:146
 msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
@@ -7652,7 +7577,7 @@ msgstr ""
 "プロファイルが、ある特定の時点で複数回アクティブになるかどうかを指定します。"
 "値は NMConnectionMultiConnect タイプになります。"
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -7678,7 +7603,7 @@ msgstr ""
 "約される必要があります。[type]、[id]、および [reserved] はすべて有効な UTF-8 "
 "にする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:148
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
@@ -7687,7 +7612,7 @@ msgstr ""
 "正しい権限で、提供された設定サービスの D-Bus インターフェースを使用して接続が"
 "修正できる場合は FALSE、接続が読み取り専用で修正できない場合は TRUE。"
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.h.in:149
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
@@ -7695,7 +7620,7 @@ msgstr ""
 "ベース接続自身が有効になると有効になる接続の UUID リスト。現時点は、VPN 接続"
 "のみがサポートされます。"
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:150
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
@@ -7703,8 +7628,7 @@ msgstr ""
 "このスレーブのマスター接続 (\"bond\" など) のデバイスタイプの設定名。この接続"
 "がスレーブではない場合は NULL。"
 
-#: ../clients/common/settings-docs.h.in:147
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -7723,7 +7647,7 @@ msgid ""
 "treated special to perform dynamic substitutions at runtime. Currently "
 "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 "
+"device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to 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 "
@@ -7749,12 +7673,13 @@ msgstr ""
 "addr-gen-mode=stable-privacy では、別々のインターフェースが別々のアドレスを生"
 "成するようにデバイス名も含まれています。この '$' 文字は、ランタイム時に動的置"
 "換を実行するのに使用されます。現在サポートされているの"
-"は、\"${CONNECTION}\"、\"${DEVICE}\"、\"${BOOT}\"、\"${RANDOM}\" です。これ"
-"は、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効果的に作成"
-"します。\"${DEVICE}\"は、デバイスのインターフェース名に対応している点に注意し"
-"てください。'$' に続く認識されていないパターンは文字通りに扱われますが、今後"
-"使用されるために予約されます。したがって、これは '$' を使用しないか、またはエ"
-"スケープ文字 \"$$\" として使用することが推奨されます。たとえば、これを "
+"は、\"${CONNECTION}\"、\"${DEVICE}\"、\"${MAC}\"、\"${BOOT}\"、\"${RANDOM}\" "
+"です。これは、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効"
+"果的に作成します。\"${DEVICE}\" は、デバイスのインターフェース名に対応"
+"し、\"${MAC}\" はデバイスの永続的 MAC アドレスという点に注意してくださ"
+"い。'$' に続く認識されていないパターンは文字通りに扱われますが、今後使用され"
+"るために予約されます。したがって、これは '$' を使用しないか、またはエスケープ"
+"文字 \"$$\" として使用することが推奨されます。たとえば、これを "
 "\"${CONNECTION}-${BOOT}-${DEVICE}\" に設定すると、この接続に対して固有の ID "
 "を作成します。これは、システムを再起動するたびに変更され、プロファイルがアク"
 "ティベートされるインターフェースに応じて異なってきます。値が設定されていない"
@@ -7762,7 +7687,7 @@ msgstr ""
 "合は、デフォルトは \"${CONNECTION}\" と類似し、接続に固有の固定 ID を使用しま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -7776,7 +7701,7 @@ msgstr ""
 "のプロパティーは読み込みのためにのみ使用されます (このプロパティーへの変更は"
 "保存されません)。"
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7790,7 +7715,7 @@ msgstr ""
 "存しない接続には、その設定のタイプ名 (つまり \"vpn\"、\"bridge\" など) が含ま"
 "れる必要があります。"
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7810,7 +7735,7 @@ msgstr ""
 "\"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数の文字と \"-\" だけが含まれ"
 "る) になります。"
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -7823,7 +7748,7 @@ msgstr ""
 "は、ファイアウォールで定義したデフォルトゾーンに設定されます。現在アクティブ"
 "な接続でこのプロパティーをアップデートすると、接続はすぐに有効になります。"
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7833,13 +7758,13 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
 "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:157
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr ""
 "FCoE コントローラーモード; \"fabric\" (デフォルト) または \"vn2vn\" のいずれ"
 "か。"
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -7849,7 +7774,7 @@ msgstr ""
 "の優先度)。\"app-fcoe-flags\" プロパティーには NM_SETTING_DCB_FLAG_ENABLE "
 "(0x1) フラグを含む場合に限り使用されます。"
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7859,7 +7784,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
 "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:160
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -7869,7 +7794,7 @@ msgstr ""
 "優先度)。\"app-fip-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE (0x1) フ"
 "ラグを含める場合に限り使用します。"
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7879,7 +7804,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
 "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -7889,7 +7814,7 @@ msgstr ""
 "の優先度)。\"app-iscsi-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE "
 "(0x1) フラグを追加する場合に限り使用します。"
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7902,7 +7827,7 @@ msgstr ""
 "用するパーセンテージを示します。グループ内の合計を 100% にする必要がありま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:164
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -7911,7 +7836,7 @@ msgstr ""
 "8 個のブール値の配列。配列のインデックスは、ユーザーの優先度 (0 - 7) に対応し"
 "ます。値は、対応する優先度が、優先度の停止を送信するかどうかを示します。"
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7921,7 +7846,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
 "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -7932,7 +7857,7 @@ msgstr ""
 "します。値は、そのグループに割り当てられたリンク帯域幅のパーセンテージを示し"
 "ます。使用できる値は 0 - 100 で、合計を 100 パーセントにする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7942,7 +7867,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
 "び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:168
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -7952,7 +7877,7 @@ msgstr ""
 "す。値は優先度グループ ID を示します。使用できる優先度グループ ID の値は 0 - "
 "7 で、15 にすると無制限グループになります。"
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -7962,7 +7887,7 @@ msgstr ""
 "す。値は、その優先度を割り当てたグループに割り当てられたすべての帯域幅を、そ"
 "の優先度が使用するかどうかを示します。"
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -7971,7 +7896,7 @@ msgstr ""
 "8 uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。"
 "値は、優先度がマッピングされるトラフィッククラス (0 - 7) を示しています。"
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7988,7 +7913,7 @@ msgstr ""
 "ロードバンドプランに対して正しい APN を使用することが重要です。APN の文字列"
 "は、a- z と 0 - 9 だけが使用でき、GSM 03.60 セクション 14.9 に準拠します。"
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
@@ -7997,7 +7922,7 @@ msgstr ""
 "(WWAN 管理サービスで指定されたように) この接続が適用されるデバイスの一意識別"
 "子。これを指定すると、接続は、指定したデバイスにのみ適用されます。"
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
@@ -8005,7 +7930,7 @@ msgstr ""
 "TRUE にすると、ホームネットワークへの接続だけが可能になります。ローミングネッ"
 "トワークへの接続は作成されません。"
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -8018,13 +7943,15 @@ msgstr ""
 "のみデバイスの登録を強制しようとします。これは、デバイスのローミングを阻止す"
 "るために使用できます。 これ以外に、ローミングを直接制御することはできません。"
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
 msgstr ""
+"GSM ベースのモデム向けに PPP データセッションを確立するために使用されたレガ"
+"シー設定。非推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
@@ -8033,7 +7960,7 @@ msgstr ""
 "PIN で SIM がロックされた場合は、その他の操作を行う前にアンロックする必要があ"
 "ります。ここで PIN を指定すると、デバイスの操作が可能になります。"
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -8044,7 +7971,7 @@ msgstr ""
 "一意識別子。これを指定すると、接続は、\"device-id\" にも許可されているデバイ"
 "スに適用されます。これには、指定した識別子に一致する SIM カードが含まれます。"
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:182
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -8056,7 +7983,7 @@ msgstr ""
 "\" および \"sim-id\" で許可されるデバイスにも適用されます。これには、指定した"
 "オペレーターから提供される SIM カードが含まれます。"
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -8066,7 +7993,7 @@ msgstr ""
 "用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC ス"
 "プーフィング)。"
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:186
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -8077,7 +8004,7 @@ msgstr ""
 "署名なし整数です。\"完全メンバーシップ\" の P_Key の場合は、その高ビットが設"
 "定されます。"
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:187
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -8087,13 +8014,13 @@ msgstr ""
 "プロパティーが設定されると、このプロパティーまたは \"mac-address\" のいずれか"
 "を設定して、ベースデバイスを指定する必要があります。"
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "IPoIB トランスポートモード。\"datagram\" または \"connected\" のいずれか。"
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:189
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
@@ -8101,7 +8028,7 @@ msgstr ""
 "パケットの先頭にカプセル化レベルをどのぐらい追加できるか。このプロパティー"
 "は、IPv6 トンネルにのみ適用されます。"
 
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -8119,7 +8046,7 @@ msgstr ""
 "(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). これらは、IPv6 トンネル"
 "のみに有効です。"
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
@@ -8127,7 +8054,7 @@ msgstr ""
 "トンネルパケットに割り当てるフローラベル。このプロパティーは、IPv6 にのみ適用"
 "されます。"
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8135,7 +8062,7 @@ msgstr ""
 "トンネル入力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
 "ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
@@ -8143,7 +8070,7 @@ msgstr ""
 "トンネルのローカルエンドポイント。値は空にできます。もしくは、IPv4 アドレスま"
 "たは IPv6 アドレスを含む必要があります。"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
@@ -8151,7 +8078,7 @@ msgstr ""
 "トンネリングモード。たとえば NM_IP_TUNNEL_MODE_IPIP (1) や "
 "NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:195
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
@@ -8159,7 +8086,7 @@ msgstr ""
 "ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きいパ"
 "ケットは、複数のフラグメントに分割されます。"
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -8167,7 +8094,7 @@ msgstr ""
 "トンネル出力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
 "ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
@@ -8177,11 +8104,11 @@ msgstr ""
 "うに、新しいデバイスがバインドされる親インターフェース名または親接続の UUID "
 "を指定します。"
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:198
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "このトンネルで、パス MTU 検出を有効にするかどうか。"
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
@@ -8189,7 +8116,7 @@ msgstr ""
 "トンネルのリモートエンドポイント。この値には、IPv4 アドレスまたは IPv6 アドレ"
 "スを含める必要があります。"
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
@@ -8197,7 +8124,7 @@ msgstr ""
 "トンネル化パケットに設定されるサービスのタイプ (IPv4) またはトラフィッククラ"
 "ス (IPv6) フィールド。"
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:201
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
@@ -8205,13 +8132,13 @@ msgstr ""
 "トンネル化パケットに割り当てる TTL。0 は特別な値で、パケットが TTL 値を継承す"
 "ることを示しています。"
 
-#: ../clients/common/settings-docs.h.in:198
-#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:223
 msgid "Array of IP addresses."
 msgstr "IP アドレスの配列。"
 
-#: ../clients/common/settings-docs.h.in:199
-#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:224
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -8227,8 +8154,7 @@ msgstr ""
 "り大きい場合はタイムアウト (ミリ秒) になります。現在、このプロパティーは "
 "IPv4 にのみ実装されています。"
 
-#: ../clients/common/settings-docs.h.in:200
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:204
 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 "
@@ -8260,13 +8186,17 @@ msgstr ""
 "ID と見なされ、'type' フィールドは 0 に設定されます。特別値である \"mac\" お"
 "よび \"perm-mac\" はサポートされています。これらは、デバイスの現在または永続"
 "的 MAC アドレスを使用して、type ethernet (01) でクライアント識別子を生成しま"
-"す。現在、これらのオプションは、ethernet リンクでのみ有効です。特別値 "
-"\"stable\" は、stable-id (connection.stable-id を参照) およびホストごとのキー"
-"を基に、type 0 のクライアント識別子を生成するようサポートされています。値が設"
-"定されない場合は、グローバルに設定されたデフォルトが使用されます。引き続き値"
-"が設定されない場合は、最後のリースのクライアント ID が再利用されます。"
+"す。現在、これらのオプションは、ethernet リンクでのみ有効です。特別値 \"duid"
+"\" は、IAID および /etc/machine-id としてインターフェース名のハッシュに基づい"
+"た RFC4361 準拠のクライアント識別子を生成します。特別値 \"stable\" は、"
+"stable-id (connection.stable-id を参照) およびホストごとのキーを基に、type 0 "
+"のクライアント識別子を生成するようサポートされています。stable-id を設定する"
+"場合は、デバイスごとのキーを取得するために \"${DEVICE}\" または \"${MAC}\" の"
+"指定子を含むことをおすすめします。値が設定されない場合は、グローバルに設定さ"
+"れたデフォルトが使用されます。引き続き値が設定されない場合は、デフォルトで "
+"DHCP プラグインに依存するよう設定されます。"
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8276,8 +8206,8 @@ msgstr ""
 "定した FQDN が DHCP サーバーに送られます。この優先度および \"dhcp-hostname\" "
 "は相互に排他的で、同時に設定できません。"
 
-#: ../clients/common/settings-docs.h.in:202
-#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:226
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8287,8 +8217,8 @@ msgstr ""
 "定した名前が DHCP サーバーに送られます。このプロパティーと \"dhcp-fqdn\" は相"
 "互に排他的で、同時に設定できません。"
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.h.in:227
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8302,18 +8232,18 @@ msgstr ""
 "NULL で、このプロパティーが TRUE の場合は、そのコンピューターの現在の永続ホス"
 "ト名が送られます。"
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:228
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "DHCP トランザクションのタイムアウト (秒単位)。"
 
-#: ../clients/common/settings-docs.h.in:205
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:229
 msgid "Array of IP addresses of DNS servers."
 msgstr "DNS サーバーの IP アドレス配列。"
 
-#: ../clients/common/settings-docs.h.in:206
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:230
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
@@ -8324,9 +8254,8 @@ msgstr ""
 "NetworkManager はデフォルトのオプションを使用し、プロパティーのリストが空に"
 "なっている場合とは区別されます。"
 
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:231
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -8342,36 +8271,39 @@ msgid ""
 "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 "
-"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
-"query domains in its search list.  Queries for domains not present in any "
-"search list are routed through connections having the '~.' special wildcard "
-"domain, which is added automatically to connections with the default route "
-"(or can be added manually).  When multiple connections specify the same "
-"domain, the one with the highest priority (lowest numerical value) wins.  If "
-"a connection specifies a domain which is subdomain of another domain with a "
-"negative DNS priority value, the subdomain is ignored."
+"Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each "
+"connection is used to query domains in its search list.  Queries for domains "
+"not present in any search list are routed through connections having the "
+"'~.' special wildcard domain, which is added automatically to connections "
+"with the default route (or can be added manually).  When multiple "
+"connections specify the same domain, the one with the highest priority "
+"(lowest numerical value) wins.  If a connection specifies a domain which is "
+"subdomain of another domain with a negative DNS priority value, the "
+"subdomain is ignored."
 msgstr ""
 "DNS サーバー優先度。この設定により指定された DNS サーバーの関連優先度。値が低"
-"い方が良い (優先度が高い) です。ゼロはデフォルト値 (VPN の場合は 50、その他の"
-"接続の場合は 100) を選択します。優先度は、複数のアクティブな接続に対して DNS "
-"設定の順番を設定しますが、同じ接続プロファイルにある複数の DNS サーバーの曖昧"
-"さは解消されません。dns=default を使用する場合、優先度の高いサーバーは "
-"resolv.conf の上に置かれます。同じ接続内で、特定のサーバーを別のサーバーより"
-"も優先したい場合は、優先順位を指定します。複数のデバイスで優先度が同じものが"
-"ある場合は、アクティブなデフォルトルートを持つものが優先されます。負の値は、"
-"より大きな優先度を持つその他の設定を除外します。したがって、優先度が負の場合"
-"は、一番低い優先度が設定されている接続の DNS サーバーだけが使用されます。"
-"dns=dnsmasq または dns=systemd-resolved として split-DNS をサポートする DNS "
-"リゾルバーを使用する際、各接続を使用して、検索リストのドメインをクエリーしま"
-"す。検索リストにないドメインのクエリーは、特別なワイルドカードドメインである "
-"'~.' を保持する接続でルーティングされます。'~.' は、デフォルトのルートで接続"
-"に自動的に追加されます (または手動での追加も可能です)。複数の接続が同じドメイ"
-"ンを指定した場合、優先度が最も高い接続 (数値が最も低い接続) が選ばれます。接"
-"続がドメインを指定し、そのドメインが、DNS の優先度の値が負である別のドメイン"
-"のサブドメインである場合、そのサブドメインは無視されます。"
+"い方が良い (優先度が高い) です。値がゼロの場合、グローバルに設定されたデフォ"
+"ルト値が使用されます。グローバルに設定されたデフォルト値がないか、または同じ"
+"くゼロの場合、デフォルト値 (VPN の場合は 50、その他の接続の場合は 100) を選択"
+"します。複数のアクティブな接続に対する DNS 設定の順番の設定を優先するよう注意"
+"してください。同じ接続プロファイルにある複数の DNS サーバーの曖昧さは解消され"
+"ません。dns=default を使用する場合、優先度の高いサーバーは resolv.conf の上に"
+"置かれます。同じ接続内で、特定のサーバーを別のサーバーよりも優先したい場合"
+"は、優先順位を指定します。複数のデバイスで優先度が同じものがある場合は、アク"
+"ティブなデフォルトルートを持つものが優先されます。負の値は、より大きな優先度"
+"を持つその他の設定を除外します。したがって、優先度が負の場合は、一番低い優先"
+"度が設定されている接続の DNS サーバーだけが使用されます。dns=dnsmasq または "
+"dns=systemd-resolved として split-DNS をサポートする DNS リゾルバーを使用する"
+"際、各接続を使用して、検索リストのドメインをクエリーします。検索リストにない"
+"ドメインのクエリーは、特別なワイルドカードドメインである '~.' を保持する接続"
+"でルーティングされます。'~.' は、デフォルトのルートで接続に自動的に追加されま"
+"す (または手動での追加も可能です)。複数の接続が同じドメインを指定した場合、優"
+"先度が最も高い接続 (数値が最も低い接続) が選ばれます。接続がドメインを指定"
+"し、そのドメインが、DNS の優先度の値が負である別のドメインのサブドメインであ"
+"る場合、そのサブドメインは無視されます。"
 
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:232
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -8383,8 +8315,8 @@ msgstr ""
 "決める際にのみ使用されます。これらは、非修飾ホスト名を完成させるためには使用"
 "されません。"
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:233
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
@@ -8392,8 +8324,8 @@ msgstr ""
 "ゲートウェイは、この設定に関連付けられています。\"アドレス\" とともに設定した"
 "場合に限り有効になります。"
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:234
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -8405,8 +8337,8 @@ msgstr ""
 "と \"dns-search\" プロパティーに指定したネームサーバーと検索ドメインだけが使"
 "用されます。"
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:235
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -8416,8 +8348,8 @@ msgstr ""
 "に設定したルートは無視され、ルートを \"routes\" プロパティーに指定した場合"
 "は、そのルートだけが使用されます。"
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:237
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8432,8 +8364,8 @@ msgstr ""
 "おいて、NMSettingIP4Config でこのプロパティーを TRUE に設定すると、IPv4 設定"
 "が失敗し、IPv6 設定が完全に成功しても、全体のネットワーク設定が成功します。"
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8460,8 +8392,8 @@ msgstr ""
 "れます。\"shared\" は、共有される uplink ではなく、インターネットをサブネット"
 "に共有するインターフェイス上で設定される必要があることに注意してください。"
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
@@ -8469,8 +8401,8 @@ msgstr ""
 "TRUE にすると、この接続はこの IP タイプに対するデフォルトの接続にはならないた"
 "め、NetworkManager によってデフォルトルートに割り当てられません。"
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8488,8 +8420,8 @@ msgstr ""
 "ティーをゼロに設定すると、実際には 1024 になることに注意してください。IPv4 で"
 "は、ゼロはメトリックの正則値となります。"
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8519,12 +8451,12 @@ msgstr ""
 "NetworkManager 以外のルーティングテーブルを管理するための後方互換性を確保しま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:242
 msgid "Array of IP routes."
 msgstr "IP ルートの配列。"
 
-#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:222
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8562,8 +8494,7 @@ msgstr ""
 "は、\"ip6-privacy\" プロパティーにより設定されたプライバシー拡張とは異なり、"
 "このオプションで設定した一時アドレスには影響しないことに注意してください。"
 
-#: ../clients/common/settings-docs.h.in:221
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:225
 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 "
@@ -8606,15 +8537,17 @@ msgstr ""
 "に) グローバルに使用され、ディスクに永続する一定のタイムスタンプが含まれま"
 "す。特別値の \"stable-llt\"、\"stable-ll\"、および \"stable-uuid\" は、対応す"
 "るタイプの DUID を生成します。これは、接続の stable-id およびホストごとの固有"
-"のキーから取得したものです。したがって、\"stable-ll\" および \"stable-llt\" "
-"のリンク層のアドレスは、stable id から算出される生成されたアドレスになりま"
-"す。\"stable-llt\" オプションの DUID-LLT タイム値は、3 年という静的タイムスパ"
-"ンの中から選ばれます (インターバルの上限は、\"llt\" で使用される一定のタイム"
-"スタンプと同じです)。プロパティーが設定されていない場合、\"ipv6.dhcp-duid\" "
-"に提供されるグローバル値が使用されます。グローバル値が提供されない場合は、デ"
-"フォルトの \"lease\" 値が想定されます。 "
+"のキーから取得したものです。このプロファイルが複数のデバイスでアクティベート"
+"される場合は、stable-id に \"${DEVICE}\" または \"${MAC}\" の指定子を含むこと"
+"をおすすめします。したがって、\"stable-ll\" および \"stable-llt\" のリンク層"
+"のアドレスは、stable id から算出される生成されたアドレスになります。\"stable-"
+"llt\" オプションの DUID-LLT タイム値は、3 年という静的タイムスパンの中から選"
+"ばれます (インターバルの上限は、\"llt\" で使用される一定のタイムスタンプと同"
+"じです)。プロパティーが設定されていない場合、\"ipv6.dhcp-duid\" に提供される"
+"グローバル値が使用されます。グローバル値が提供されない場合は、デフォルトの "
+"\"lease\" 値が想定されます。 "
 
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:236
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8643,7 +8576,7 @@ msgstr ""
 "ロパティーの \"stable-privacy\" 設定で有効にできる、安定したプライバシーアド"
 "レスとは区別されます。"
 
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -8651,33 +8584,33 @@ msgstr ""
 "IPv6 トークン化したインターフェース識別子 draft-chown-6man-tokenised-ipv6-"
 "identifiers-02 にトークンを設定します。eui64 addr-gen-mode で行うと便利です。"
 
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:244
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "転送トラフィックの暗号化が必要かどうか。"
 
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr "MACsec キー一致における共有前の CAK (接続関連キー)。"
 
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:246
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "\"mka-cak\" プロパティーの処理方法を示すフラグ。"
 
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr "MACsec キー一致における共有前の CKN (接続に関連するキー名)。"
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr ""
 "MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。"
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:249
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -8689,13 +8622,13 @@ msgstr ""
 "には、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含め"
 "る必要があります。"
 
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント (1 - 65534)。"
 
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
@@ -8703,11 +8636,11 @@ msgstr ""
 "パケットごとに SCI (セキュアチャネル識別子) が含まれているかどうかを指定しま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:252
 msgid "Specifies the validation mode for incoming frames."
 msgstr "入力フレームの検証モードを指定します。"
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:253
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
@@ -8715,7 +8648,7 @@ msgstr ""
 "同じ低いデバイスで、複数の macvlans 間で通信メカニズムを指定する macvlan モー"
 "ド。"
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -8727,15 +8660,15 @@ msgstr ""
 "に、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含める"
 "必要があります。"
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:255
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "インターフェースをプロミスキャスモードにするべきかどうか。"
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:256
 msgid "Whether the interface should be a MACVTAP."
 msgstr "インターフェースが MACVTAP にすべきかどうか。"
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "A list of interface names to match. Each element is a shell wildcard "
 "pattern.  When an element is prefixed with exclamation mark (!) the "
@@ -8751,27 +8684,27 @@ msgstr ""
 "はこのような要素がない場合、(b) 感嘆符 (!) が先頭に付いている要素がどれも一致"
 "しない。"
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:258
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr "ブリッジの失敗モード。\"secure\"、\"standalone\"、また空のいずれか。"
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:259
 msgid "Enable or disable multicast snooping."
 msgstr "マルチキャストのスヌーピングを有効化または無効化にします。"
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:260
 msgid "Enable or disable RSTP."
 msgstr "RSTP を有効化または無効化にします。"
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:261
 msgid "Enable or disable STP."
 msgstr "STP を有効化または無効化にします。"
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:262
 msgid "The interface type. Either \"internal\", or empty."
 msgstr "インターフェースのタイプ。\"internal\" または空のいずれかになります。"
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:263
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
@@ -8779,34 +8712,34 @@ msgstr ""
 "接続するリモートの Open vSwitch ブリッジポートのユニキャスト宛先 IP アドレス"
 "を指定します。"
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:264
 msgid "The time port must be inactive in order to be considered down."
 msgstr ""
 "ダウンしたと見なすためには、タイムポートを非アクティブにする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:265
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "ボンディングモード。\"active-backup\"、\"balance-slb\"、または \"balance-tcp"
 "\" のいずれかになります。"
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:266
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr ""
 "トラフィックの転送を始める前に、タイムポートをアクティブにする必要がありま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:267
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr ""
 "LACP モード。\"active\"、\"off\"、または \"passive\" のいずれかになります。"
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:268
 msgid "The VLAN tag in the range 0-4095."
 msgstr "VLAN タグは  0 - 4095 の範囲内にあります。"
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:269
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
@@ -8814,7 +8747,7 @@ msgstr ""
 "VLAN モード。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" の"
 "いずれかに設定するか、何も設定しません。"
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:270
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
@@ -8823,7 +8756,7 @@ msgstr ""
 "ゼロ以外は、pppd より指定したボーレートにシリアルポートを設定します。速度が自"
 "動的に選択されるように、通常は、この値を 0 にします。"
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
@@ -8833,7 +8766,7 @@ msgstr ""
 "フロー制御を使用するシリアルポートを設定する必要があります。この値は、通常は "
 "FALSE に設定する必要があります。"
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:272
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -8845,7 +8778,7 @@ msgstr ""
 "場合は、\"lcp-echo-interval\" プロパティーもゼロ以外の値に設定する必要があり"
 "ます。"
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:273
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -8856,7 +8789,7 @@ msgstr ""
 "うになります (n は指定した値)。PPP ピアの一部だけがエコー要求に応答します。こ"
 "れを自動検出することはできません。"
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:274
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
@@ -8864,7 +8797,7 @@ msgstr ""
 "TRUE の場合は、ステートフル MPPE が使用されます。ステートフル MPPE の詳細は "
 "pppd ドキュメントを参照してください。"
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:275
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
@@ -8873,16 +8806,16 @@ msgstr ""
 "ゼロ以外は、指定したサイズ以下のパケットをピアが送信するように pppd が要求し"
 "ます。ゼロ以外では、MRU は 128 から 16384 の間にする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:276
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr "ゼロ以外は、pppd により、指定したサイズ以下のパケットが送信されます。"
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:277
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr "TRUE の場合は、Van Jacobsen TCP ヘッダー圧縮が要求されません。"
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:278
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -8892,35 +8825,35 @@ msgstr ""
 "されません。FALSE の場合は、リモート側からの認証が必要になります。ほとんどす"
 "べての場合で、これは TRUE にする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:279
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "TRUE の場合は、BSD 圧縮が要求されません。"
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:280
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "TRUE の場合は、\"deflate\" 圧縮が要求されません。"
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:281
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "TRUE の場合は、CHAP 認証方法が使用されません。"
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:282
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "TRUE の場合は、EAP 認証方法が使用されません。"
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:283
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "TRUE の場合は、MSCHAP 認証方法が使用されません。"
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:284
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "TRUE の場合は、MSCHAPv2 認証方法が使用されません。"
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:285
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "TRUE の場合は、PAP 認証方法が使用されません。"
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:286
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -8931,7 +8864,7 @@ msgstr ""
 "なると、セッションは失敗します。MPPE がモバイルブロードバンド接続に使用されな"
 "い点に注意してください。"
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -8942,7 +8875,7 @@ msgstr ""
 "定する必要があります。128 ビットの MPPE が利用できないと、セッションは失敗し"
 "ます。"
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -8953,11 +8886,11 @@ msgstr ""
 "このプロパティーを指定しないと、この接続は、NMSettingConnection の "
 "\"interface-name\" に指定したインターフェースで接続が有効になります。"
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:289
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "PPPoE サービスでの認証に使用するパスワード。"
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -8969,29 +8902,29 @@ msgstr ""
 "定を空白のままにする必要があります。これは、アクセス集線装置が複数ある場合"
 "や、特別なサービスが必要であることが分かっている場合に限り必要になります。"
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:292
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "PPPoE サービスでの認証に使用するユーザー名。"
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:293
 msgid "Whether the proxy configuration is for browser only."
 msgstr "プロキシー設定がブラウザー専用であるかどうか。"
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "プロキシー設定の方法。デフォルトは NM_SETTING_PROXY_METHOD_NONE (0) です。"
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:295
 msgid "PAC script for the connection."
 msgstr "接続の PAC スクリプト。"
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:296
 msgid "PAC URL for obtaining PAC file."
 msgstr "PAC ファイルを取得する PAC URL"
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:297
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
@@ -9001,19 +8934,19 @@ msgstr ""
 "ドモデムには影響しません。通常は速度設定を無視し、利用可能な最高の速度を使用"
 "します。"
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:298
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "シリアル接続のバイト幅。たとえば、\"8n1\" の 8 です。"
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:299
 msgid "Parity setting of the serial port."
 msgstr "シリアルポートのパリティ設定。"
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:300
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "モデムに送信したバイト間の遅延時間 (マイクロ秒単位)。"
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:301
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -9021,7 +8954,7 @@ msgstr ""
 "シリアルポートで通信するための停止ビットの数。1 または 2 のいずれかになりま"
 "す。たとえば、\"8n1\" の 1 です。"
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:302
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -9040,16 +8973,19 @@ msgstr ""
 "されます。グローバルデフォルトが指定されていない場合は、NM_TERNARY_TRUE (1) "
 "に設定されていると推測されます。"
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:303
 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 ""
+"作成する仮想関数の総数。sriov 設定が有効な場合、NetworkManager はインター"
+"フェース上の仮想関数の数を強化し、ゼロの場合も同様である点に注意してくださ"
+"い。SR-IOV パラメーターへの変更を阻止するには、sriov 設定を接続に追加しないで"
+"ください。"
 
-#: ../clients/common/settings-docs.h.in:300
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:304
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
@@ -9065,20 +9001,22 @@ msgstr ""
 "仮想関数記述子の配列。各 VF 記述子は、GVariant 値に対する辞書マッピング属性名"
 "です。各 VF にとって 'index' エントリーは必須です。文字列で表す場合、VF の形"
 "式は \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\" となります。たとえば、\"2 "
-"mac=00:11:22:33:44:55 spoof-check=true\" などです。\"vlans\" 属性は、VLAN 記"
-"述子の semicolor-separated 一覧として表されます。ここでは、各記述子の形式は "
-"\"ID[.PRIORITY[.PROTO]]\" となります。PROTO は 'q' (802.1Q、デフォルト) また"
-"は 'ad' (802.1ad) のいずれかになります。"
+"mac=00:11:22:33:44:55 spoof-check=true\" などです。複数の VF は、コンマをセパ"
+"レーターとして使用することで指定できます。現在サポートされている属性は、mac、"
+"spoof-check、trust、min-tx-rate、max-tx-rate、および vlans です。\"vlans\" 属"
+"性は、VLAN 記述子の semicolon-separated 一覧として表されます。ここでは、各記"
+"述子の形式は \"ID[.PRIORITY[.PROTO]]\" となります。PROTO は 'q' (802.1Q、デ"
+"フォルト) または 'ad' (802.1ad) のいずれかになります。"
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:305
 msgid "Array of TC queueing disciplines."
 msgstr "TC キュー処理の配列"
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:306
 msgid "Array of TC traffic filters."
 msgstr "TC トラフィックフィルターの配列"
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:307
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -9090,9 +9028,8 @@ msgstr ""
 "指定しないと、デフォルトの設定が使用されます。フォーマットの詳細は、man "
 "teamd.conf を参照してください。"
 
-#: ../clients/common/settings-docs.h.in:304
-#: ../clients/common/settings-docs.h.in:322
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:326
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9109,76 +9046,68 @@ msgstr ""
 "'name' でディクショナリーに指定したものになります。利用できるキー: ethtool で"
 "は 'delay-up'、'delay-down'、'init-wait'。nsna_ping では 'init-"
 "wait'、'interval'、'missed-max'、'target-host'。arp_ping では、nsna_ping の全"
-"キーおよび 'source-host'、'validate-active'、'validate-incative'、'send-"
+"キーおよび 'source-host'、'validate-active'、'validate-inactive'、'send-"
 "always'。詳細は teamd.conf の man ページを参照してください。"
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:309
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "teamd mcast_rejoin.count に相当します。"
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:310
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "teamd mcast_rejoin.interval に相当します。"
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:311
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "teamd notify_peers.count に相当します。"
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:312
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "teamd notify_peers.interval に相当します。"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:313
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
-"setting the runner, all the properties specific to the runner will be reset "
-"to the default value; all the properties specific to other runners will be "
-"set to an empty value (or if not possible to a default value)."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
 msgstr ""
-"teamd runner.name に相当します。可能な値: \"roundrobin\"、\"broadcast"
-"\"、\"activebackup\"、\"loadbalance\"、\"lacp\"、\"random\"。ランナーを設定す"
-"る際、このランナー特有のすべてのプロパティーは、デフォルト値にリセットされま"
-"す。他のランナー特有のプロパティーはすべて、空の値に設定されます (または、デ"
-"フォルト値に設定されない場合は空の値に設定されます)。"
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:314
 msgid "Corresponds to the teamd runner.active."
 msgstr "teamd runner.active に相当します。"
 
-#: ../clients/common/settings-docs.h.in:311
+#: ../clients/common/settings-docs.h.in:315
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "teamd runner.agg_select_policy に相当します"
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:316
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "teamd runner.fast_rate に相当します。"
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:317
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "teamd runner.hwaddr_policy に相当します。"
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:318
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "teamd runner.min_ports に相当します。"
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:319
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "teamd runner.sys_prio に相当します。"
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:320
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "teamd runner.tx_balancer.name に相当します。"
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:321
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "teamd runner.tx_balancer.interval に相当します。"
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:322
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "teamd runner.tx_hash に相当します。"
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:323
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -9190,19 +9119,19 @@ msgstr ""
 "は、デフォルト設定が使用されます。フォーマットの詳細は、man teamd.conf を参照"
 "してください。"
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:324
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "teamd ports.PORTIFNAME.lacp_key に相当します。"
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:325
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "teamd ports.PORTIFNAME.lacp_prio に相当します。"
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "teamd ports.PORTIFNAME.prio に相当します。"
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:328
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
@@ -9210,11 +9139,11 @@ msgstr ""
 "teamd ports.PORTIFNAME.queue_id に相当します。-1 に設定すると、このパラメー"
 "ターは json 設定で無視されます。"
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "teamd ports.PORTIFNAME.sticky に相当します。"
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:330
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9222,7 +9151,7 @@ msgstr ""
 "デバイスを所有するグループ ID。NULL を設定すると、誰でもこのデバイスを使用で"
 "きるようになります。"
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:331
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -9232,7 +9161,7 @@ msgstr ""
 "成する NM_SETTING_TUN_MODE_TUN (1) と、Ethernet のようなレイヤー 2 デバイスを"
 "作成する NM_SETTING_TUN_MODE_TAP (2) です。"
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -9242,7 +9171,7 @@ msgstr ""
 "プター (キュー) を使用して、パケットの送受信を並行して処理します。TRUE に設定"
 "しないと、インターフェースは 1 つのキューしかサポートしません。"
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:333
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -9250,7 +9179,7 @@ msgstr ""
 "デバイスを所有するユーザー ID。NULL を設定すると、誰でもこのデバイスを使用で"
 "きるようになります。"
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:334
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
@@ -9258,7 +9187,7 @@ msgstr ""
 "TRUE の場合、インターフェースは、パケットの先頭に、物理インターフェースを接続"
 "する 4 バイトのヘッダーを追加します。"
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:335
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
@@ -9266,7 +9195,7 @@ msgstr ""
 "IFF_VNET_HDR を TRUE にすると、トンネルパケットには、virtio ネットワークヘッ"
 "ダーが含まれます。"
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:336
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -9278,7 +9207,7 @@ msgstr ""
 "ascii フォーマットのみをサポートしますが、値は、指定した長さまでの任意の "
 "UTF8 文字列にできます。"
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:337
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9288,7 +9217,7 @@ msgstr ""
 "このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
 "など、署名なし整数にします。"
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:338
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -9309,7 +9238,7 @@ msgstr ""
 "た。後方互換性を確保するには D-Bus API のデフォルト値を 0 のままにし、D-Bus "
 "における不明なプロパティーは引き続き 0 と見なされます。"
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:339
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -9317,7 +9246,7 @@ msgstr ""
 "この接続が作成するインターフェースを割り当てる必要がある VLAN 識別子。有効は"
 "範囲は 0 - 4094 となり、予約されている id 4095 は除外されます。"
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:340
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -9327,7 +9256,7 @@ msgstr ""
 "このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
 "など、署名なし整数にします。"
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -9339,7 +9268,7 @@ msgstr ""
 "に、\"mac-address\" プロパティーが指定されている \"802-3-ethernet\" 設定を含"
 "める必要があります。"
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:342
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
@@ -9347,7 +9276,7 @@ msgstr ""
 "VPN プラグイン特有のデータにおけるキーと値がペアになったディクショナリー。"
 "キーと値の両方を文字列にする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:343
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
@@ -9357,7 +9286,7 @@ msgstr ""
 "VPN は、明示的に切断されるまで、リンクが変更され、停止しても接続されたままに"
 "なります。"
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
@@ -9365,7 +9294,7 @@ msgstr ""
 "パスワードや秘密鍵など、VPN プラグイン特有のシークレットに関するキーと値のペ"
 "アのディクショナリー。キーと値はともに文字列にする必要があります。"
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:345
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -9373,7 +9302,7 @@ msgstr ""
 "この設定がネットワークに接続するのに使用する VPN プラグインの D-Bus サービス"
 "名。vpnc プラグインの場合は org.freedesktop.NetworkManager.vpnc です。"
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:346
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -9385,7 +9314,7 @@ msgstr ""
 "ファイルで vpn.timeout を上書きしていない場合)。ゼロ以外の値を設定した場合"
 "は、それがタイムアウト (秒単位) となります。"
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:347
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -9400,11 +9329,11 @@ msgstr ""
 "すると、NetworkManager は、VPN 接続を要求するユーザーのユーザー名を自動的に提"
 "供します。"
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:348
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "カーネルが学習する FDB エントリーの存続時間 (秒単位) を指定します。"
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:349
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
@@ -9412,24 +9341,24 @@ msgstr ""
 "リモートの VXLAN トンネルエンドポイントに接続する UDP 宛先ポートを指定しま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 "使用する VXLAN ネットワーク識別子 (または VXLAN セグメント識別子) を指定しま"
 "す。"
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:351
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr ""
 "ネットリンク LL ADDR が欠落している通知が生成されるかどうかを指定します。"
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:352
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr ""
 "ネットリンク IP ADDR が欠落している通知が生成されるかどうかを指定します。"
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
@@ -9437,7 +9366,7 @@ msgstr ""
 "未知のソースリンクレイヤーのアドレスと IP アドレスを、VXLAN デバイス転送デー"
 "タベースに入力するかどうかを指定します。"
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
@@ -9445,21 +9374,21 @@ msgstr ""
 "FDB エントリーの最大数を指定します。値がゼロの場合は、カーネルがエントリーを"
 "無限に保存することを意味します。"
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:355
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 "指定した場合は、送信パケットで使用するソースの IP アドレスを指定します。"
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr "指定した場合は、親インターフェース名または親接続の UUID を指定します。"
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:357
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "ARP プロキシーをオンにするかどうかを指定します"
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
@@ -9469,11 +9398,11 @@ msgstr ""
 "パケットで使用するユニキャストの宛先 IP アドレス、または参加するマルチキャス"
 "ト IP アドレスを指定します。"
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:359
 msgid "Specifies whether route short circuit is turned on."
 msgstr "ルートのショートサーキットがオンになっているかどうかを指定します。"
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9481,7 +9410,7 @@ msgstr ""
 "リモート VXLAN のトンネルエンドポイントに接続する最大 UDP ソースポートを指定"
 "します。"
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9489,15 +9418,46 @@ msgstr ""
 "リモートの VXLAN トンネルエンドポイントに接続するための最小 UDP ソースポート"
 "を指定します。"
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:362
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "送信パケットで使用する TOS 値を指定します。"
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:363
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr "送信パケットで使用する生存時間の値を使用します。"
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:364
+msgid ""
+"The P2P device that should be connected to. Currently this is the only way "
+"to create or join a group."
+msgstr ""
+"接続されなければならない P2P デバイス。これは、現時点でグループを作成またはグ"
+"ループに参加する唯一の方法です。"
+
+#: ../clients/common/settings-docs.h.in:365
+msgid ""
+"The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
+"requires a protocol specific information element to be set in certain Wi-Fi "
+"frames. These can be specified here for the purpose of establishing a "
+"connection. This setting is only useful when implementing a Wi-Fi Display "
+"client."
+msgstr ""
+"Wi-Fi Display (WFD) Information Elements (IEs) の設定。Wi-Fi Display は、特定"
+"の Wi-Fi フレームにプロトコル指定の情報エレメントを設定する必要があります。こ"
+"れらは、接続を確立する目的でここで指定できます。この設定は、Wi-Fi Display ク"
+"ライアントを実装する場合にのみ役立ちます。 "
+
+#: ../clients/common/settings-docs.h.in:366
+msgid ""
+"Flags indicating which mode of WPS is to be used. There's little point in "
+"changing the default setting as NetworkManager will automatically determine "
+"the best method to use."
+msgstr ""
+"WPS のモードが使用される場合に、どのモードが使用されるかを示すフラグ。"
+"NetworkManager  が最適なメソッドの使用を自動的に決定するため、デフォルト設定"
+"を変更する利点はほとんどありません。"
+
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
@@ -9507,7 +9467,7 @@ msgstr ""
 "す。このプロパティーはデバイスの MAC アドレスを変更しません (MAC スプーフィン"
 "グとして知られています)。非推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:368
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
@@ -9515,13 +9475,66 @@ msgstr ""
 "この接続が使用する WiMAX ネットワークのネットワークサービスプロバイダー "
 "(NSP) 名。非推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:369
+msgid ""
+"The use of fwmark is optional and is by default off. Setting it to 0 "
+"disables it. Otherwise it is a 32-bit fwmark for outgoing packets."
+msgstr ""
+"fwmark の使用はオプションで、デフォルトでオフに設定されています。これを 0 に"
+"設定すると、無効化されます。無効化されなければ、出力パケットでは 32 ビットの "
+"fwmark です。"
+
+#: ../clients/common/settings-docs.h.in:370
+msgid ""
+"The listen-port. If listen-port is not specified, the port will be chosen "
+"randomly when the interface comes up."
+msgstr ""
+"listen-port です。listen-port が指定されていない場合、インターフェースを起動"
+"した際、ポートはランダムに選択されます。"
+
+#: ../clients/common/settings-docs.h.in:371
+msgid ""
+"If non-zero, only transmit packets of the specified size or smaller, "
+"breaking larger packets up into multiple fragments. If zero a default MTU is "
+"used. Note that contrary to wg-quick's MTU setting, this does not take into "
+"account the current routes at the time of activation."
+msgstr ""
+"ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きなパ"
+"ケットは、複数のフラグメントに分割されます。ゼロの場合は、デフォルトの MTU を"
+"使用します。wg-quick の MTU 設定とは対照的に、これはアクティベーション時に現"
+"行のルートについて考慮しない点に注意してください。"
+
+#: ../clients/common/settings-docs.h.in:372
+msgid ""
+"Whether to automatically add routes for the AllowedIPs ranges of the peers. "
+"If TRUE (the default), NetworkManager will automatically add routes in the "
+"routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
+"no such routes are added automatically. In this case, the user may want to "
+"configure static routes in ipv4.routes and ipv6.routes, respectively."
+msgstr ""
+"ピアの AllowedIPs 範囲にルートを自動的に追加するかどうか。TRUE (デフォルト) "
+"の場合、NetworkManager は ipv4.route-table および ipv6.route-table に従って、"
+"ルーティングテーブルにルートを自動的に追加します。FALSE の場合、このような"
+"ルートは自動的に追加されません。この場合、ユーザーが ipv4.routes および ipv6."
+"routes のそれぞれに静的ルートを設定することをおすすめします。"
+
+#: ../clients/common/settings-docs.h.in:373
+msgid "The 256 bit private-key in base64 encoding."
+msgstr "base64 エンコードにおける 256 ビットのプライベートキー。"
+
+#: ../clients/common/settings-docs.h.in:374
+msgid "Flags indicating how to handle the \"private-key\" property."
+msgstr "\"private-key\" プロパティーの処理方法を示すフラグ。"
+
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
 msgstr ""
+"IEEE 802.15.4 チャンネル。正の整数または -1 は、\"すでにデバイスに設定されて"
+"いるものを設定したり使用したりしません\" を意味します。"
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:376
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
@@ -9529,17 +9542,19 @@ msgstr ""
 "指定すると、この接続は永続的な MAC アドレスに一致する IEEE 802.15.4 (WPAN) "
 "MAC 層デバイスにのみ適用されます。"
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:377
 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 ""
+"IEEE 802.15.4 のチャンネルページ。正の整数または -1 は、\"すでにデバイスに設"
+"定されているものを設定したり使用したりしません\" を意味します。"
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:378
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "IEEE 802.15.4 パーソナルエリアネットワーク (PAN) 識別子。"
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:379
 msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr "限定環境内にて使用される IEEE 802.15.4 のショートアドレス"
 
@@ -9590,31 +9605,30 @@ msgstr ""
 "無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
 "い。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
+#: ../clients/tui/newt/nmt-newt-utils.c:176 ../clients/tui/nmt-editor.c:433
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
 #: ../clients/tui/nmtui.c:134
 msgid "OK"
 msgstr "OK"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:325
-#: ../clients/tui/newt/nmt-newt-utils.c:357
+#: ../clients/tui/newt/nmt-newt-utils.c:324
+#: ../clients/tui/newt/nmt-newt-utils.c:356
 #, c-format
 msgid "Could not create temporary file: %s"
 msgstr "一時ファイルを作成できませんでした: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:363
+#: ../clients/tui/newt/nmt-newt-utils.c:362
 #, c-format
 msgid "Editor failed: %s"
 msgstr "エディタが失敗しました: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:369
+#: ../clients/tui/newt/nmt-newt-utils.c:368
 #, c-format
 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:1380
+#: ../clients/tui/nm-editor-utils.c:144 ../libnm/nm-device.c:1380
 msgid "Ethernet"
 msgstr "Ethernet"
 
@@ -9623,8 +9637,7 @@ msgstr "Ethernet"
 msgid "Ethernet connection %d"
 msgstr "Ethernet 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
-#: ../libnm/nm-device.c:1382
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm/nm-device.c:1382
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -9633,8 +9646,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:2376
-#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2518
+#: ../libnm/nm-device.c:1398
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
@@ -9643,8 +9656,7 @@ msgstr "InfiniBand"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
-#: ../libnm/nm-device.c:1396
+#: ../clients/tui/nm-editor-utils.c:170 ../libnm/nm-device.c:1396
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -9662,10 +9674,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../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
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2510
 #: ../libnm/nm-device.c:1400
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4898
 msgid "Bond"
 msgstr "ボンド"
 
@@ -9674,10 +9685,9 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../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
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2514
 #: ../libnm/nm-device.c:1404
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5253
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -9686,10 +9696,9 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../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
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2512
 #: ../libnm/nm-device.c:1402
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4971
 msgid "Team"
 msgstr "team "
 
@@ -9699,8 +9708,7 @@ 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:2374 ../libnm-glib/nm-device.c:1840
-#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406
+#: ../libnm-core/nm-connection.c:2516 ../libnm/nm-device.c:1406
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -9750,57 +9758,61 @@ msgstr "隠す"
 msgid "Show"
 msgstr "表示する"
 
-#: ../clients/tui/nmt-editor.c:98
+#: ../clients/tui/nmt-editor.c:100
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
 msgstr "接続 '%s'、タイプ '%s' 用のエディターを作成できませんでした。"
 
-#: ../clients/tui/nmt-editor.c:102
+#: ../clients/tui/nmt-editor.c:104
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
 msgstr "無効な接続 '%s' のエディターを作成できませんでした。"
 
-#: ../clients/tui/nmt-editor.c:112
+#: ../clients/tui/nmt-editor.c:114
 msgid "Edit Connection"
 msgstr "接続の編集"
 
-#: ../clients/tui/nmt-editor.c:173
+#: ../clients/tui/nmt-editor.c:175
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "接続を保存できません: %s"
 
-#: ../clients/tui/nmt-editor.c:187
+#: ../clients/tui/nmt-editor.c:189
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "新しい接続を追加できません: %s"
 
-#: ../clients/tui/nmt-editor.c:332
+#: ../clients/tui/nmt-editor.c:336
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: ../clients/tui/nmt-editor.c:343
+#: ../clients/tui/nmt-editor.c:347
 msgid "Ethernet device"
 msgstr "Ethernet デバイス"
 
-#: ../clients/tui/nmt-editor.c:345
+#: ../clients/tui/nmt-editor.c:349
 msgid "Device"
 msgstr "デバイス"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:405
+#: ../clients/tui/nmt-editor.c:409
 msgid "Automatically connect"
 msgstr "自動的に接続する"
 
-#: ../clients/tui/nmt-editor.c:411
+#: ../clients/tui/nmt-editor.c:415
 msgid "Available to all users"
 msgstr "全ユーザーに使用可能"
 
-#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-editor.c:430 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
 #: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
 msgstr "取り消し"
 
+#: ../clients/tui/nmt-mtu-entry.c:84
+msgid "(default)"
+msgstr "(デフォルト)"
+
 #: ../clients/tui/nmt-mtu-entry.c:86 ../clients/tui/nmt-mtu-entry.c:117
 msgid "bytes"
 msgstr "バイト"
@@ -10505,120 +10517,120 @@ msgstr "NetworkManager に接続できませんでした: %s.\n"
 msgid "NetworkManager is not running."
 msgstr "NetworkManager が実行していません。"
 
-#: ../libnm-core/nm-crypto.c:214
+#: ../libnm-core/nm-crypto.c:213
 #, c-format
 msgid "PEM key file had no start tag"
 msgstr "PEM キーファイルには開始タグがありません"
 
-#: ../libnm-core/nm-crypto.c:222 ../libnm-util/crypto.c:130
+#: ../libnm-core/nm-crypto.c:221
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM キーファイルには終了タグ '%s' がありません。"
 
-#: ../libnm-core/nm-crypto.c:249 ../libnm-util/crypto.c:160
+#: ../libnm-core/nm-crypto.c:248
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "不正形式の PEM ファイル: Proc-Type は最初のタグではありません。"
 
-#: ../libnm-core/nm-crypto.c:257 ../libnm-util/crypto.c:168
+#: ../libnm-core/nm-crypto.c:256
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "不正形式の PEM ファイル: 不明な Proc-Type タグ '%s' です。"
 
-#: ../libnm-core/nm-crypto.c:269 ../libnm-util/crypto.c:178
+#: ../libnm-core/nm-crypto.c:268
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "不正形式の PEM ファイル: DEK-Info は2つ目のタグではありません。"
 
-#: ../libnm-core/nm-crypto.c:280 ../libnm-util/crypto.c:189
+#: ../libnm-core/nm-crypto.c:279
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見つかりません。"
 
-#: ../libnm-core/nm-crypto.c:288 ../libnm-util/crypto.c:196
+#: ../libnm-core/nm-crypto.c:287
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "不正形式の PEM ファイル: DEK-Info タグ内に無効な形式の IV"
 
-#: ../libnm-core/nm-crypto.c:299 ../libnm-util/crypto.c:211
+#: ../libnm-core/nm-crypto.c:298
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "不正形式の PEM ファイル: 不明なプライベートキー暗号文 '%s'。"
 
-#: ../libnm-core/nm-crypto.c:320 ../libnm-util/crypto.c:230
+#: ../libnm-core/nm-crypto.c:319
 #, c-format
 msgid "Could not decode private key."
 msgstr "プライベートキーを復号できませんでした。"
 
-#: ../libnm-core/nm-crypto.c:361 ../libnm-util/crypto.c:282
+#: ../libnm-core/nm-crypto.c:360
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "期待されている PKCS#8 開始タグの検出に失敗しました。"
 
-#: ../libnm-core/nm-crypto.c:369 ../libnm-util/crypto.c:290
+#: ../libnm-core/nm-crypto.c:368
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "期待されている PKCS#8 終了タグ '%s' の検出に失敗しました。"
 
-#: ../libnm-core/nm-crypto.c:381 ../libnm-util/crypto.c:309
+#: ../libnm-core/nm-crypto.c:380
 msgid "Failed to decode PKCS#8 private key."
 msgstr "PKCS#8 プライベートキーの復号に失敗しました。"
 
-#: ../libnm-core/nm-crypto.c:440 ../libnm-util/crypto.c:351
+#: ../libnm-core/nm-crypto.c:439
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV は、その長さで偶数のバイト数でなければなりません。"
 
-#: ../libnm-core/nm-crypto.c:456 ../libnm-util/crypto.c:365
+#: ../libnm-core/nm-crypto.c:455
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV は 16進法でない数字を含んでいます。"
 
-#: ../libnm-core/nm-crypto.c:532
+#: ../libnm-core/nm-crypto.c:531
 #, c-format
 msgid "IV must contain at least 8 characters"
 msgstr "IV は最低 8 文字が必要"
 
-#: ../libnm-core/nm-crypto.c:580 ../libnm-util/crypto.c:515
+#: ../libnm-core/nm-crypto.c:579
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "プライベートキーのタイプを判定できません。"
 
-#: ../libnm-core/nm-crypto.c:592
+#: ../libnm-core/nm-crypto.c:591
 #, c-format
 msgid "Password provided, but key was not encrypted."
 msgstr "パスワードが提供されましたが、キーは暗号化されませんでした。"
 
-#: ../libnm-core/nm-crypto.c:653 ../libnm-util/crypto.c:570
+#: ../libnm-core/nm-crypto.c:652
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
 
-#: ../libnm-core/nm-crypto.c:662 ../libnm-util/crypto.c:579
+#: ../libnm-core/nm-crypto.c:661
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
 
-#: ../libnm-core/nm-crypto.c:674 ../libnm-util/crypto.c:597
+#: ../libnm-core/nm-crypto.c:673
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "証明書の復号に失敗しました。"
 
-#: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756
+#: ../libnm-core/nm-crypto.c:702 ../libnm-core/nm-crypto.c:755
 #, c-format
 msgid "Certificate file is empty"
 msgstr "証明書ファイルが空です"
 
-#: ../libnm-core/nm-crypto.c:736
+#: ../libnm-core/nm-crypto.c:735
 #, c-format
 msgid "Failed to recognize certificate"
 msgstr "証明書の認識に失敗しました"
 
-#: ../libnm-core/nm-crypto.c:846
+#: ../libnm-core/nm-crypto.c:845
 #, c-format
 msgid "not a valid private key"
 msgstr "無効なプライベートキー"
 
-#: ../libnm-core/nm-crypto-gnutls.c:75 ../libnm-util/crypto_gnutls.c:48
+#: ../libnm-core/nm-crypto-gnutls.c:75
 msgid "Failed to initialize the crypto engine."
 msgstr "暗号化エンジンの初期化に失敗しました。"
 
@@ -10632,24 +10644,22 @@ msgstr "解読がサポートされていないキーの暗号"
 msgid "Invalid IV length (must be at least %u)."
 msgstr "IV の長さが無効です (最低でも %u が必要)。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:134 ../libnm-util/crypto_gnutls.c:175
+#: ../libnm-core/nm-crypto-gnutls.c:134
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
 msgstr "復号化暗号文コンテキストの初期化に失敗しました: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:146 ../libnm-util/crypto_gnutls.c:184
+#: ../libnm-core/nm-crypto-gnutls.c:146
 #, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
 msgstr "プライベートキーの復号に失敗しました: %s (%s)"
 
 #: ../libnm-core/nm-crypto-gnutls.c:160 ../libnm-core/nm-crypto-nss.c:223
-#: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "プライベートキーの復号に失敗しました: 予想外の不要語句の長さです。"
 
 #: ../libnm-core/nm-crypto-gnutls.c:171 ../libnm-core/nm-crypto-nss.c:234
-#: ../libnm-util/crypto_gnutls.c:205 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "プライベートキーの復号に失敗しました。"
@@ -10659,122 +10669,122 @@ msgstr "プライベートキーの復号に失敗しました。"
 msgid "Unsupported key cipher for encryption"
 msgstr "暗号化がサポートされていないキーの暗号"
 
-#: ../libnm-core/nm-crypto-gnutls.c:221 ../libnm-util/crypto_gnutls.c:280
+#: ../libnm-core/nm-crypto-gnutls.c:221
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr "暗号化暗号文コンテキストの初期化に失敗しました: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:247 ../libnm-util/crypto_gnutls.c:289
+#: ../libnm-core/nm-crypto-gnutls.c:247
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "データの暗号化に失敗しました: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:272 ../libnm-util/crypto_gnutls.c:329
+#: ../libnm-core/nm-crypto-gnutls.c:272
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "証明書データの初期化にエラー発生: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:294 ../libnm-util/crypto_gnutls.c:351
+#: ../libnm-core/nm-crypto-gnutls.c:294
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "証明書をデコードできませんでした: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:321 ../libnm-util/crypto_gnutls.c:375
+#: ../libnm-core/nm-crypto-gnutls.c:321
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12 デコーダーを初期化できません: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:334 ../libnm-util/crypto_gnutls.c:388
+#: ../libnm-core/nm-crypto-gnutls.c:334
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルをデコードできません: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:348 ../libnm-util/crypto_gnutls.c:400
+#: ../libnm-core/nm-crypto-gnutls.c:348
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルを確証できません: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:376 ../libnm-util/crypto_gnutls.c:428
+#: ../libnm-core/nm-crypto-gnutls.c:376
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:403 ../libnm-util/crypto_gnutls.c:451
+#: ../libnm-core/nm-crypto-gnutls.c:403
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "PKCS#8 ファイルをデコードできませんでした: %s"
 
-#: ../libnm-core/nm-crypto-nss.c:82 ../libnm-util/crypto_nss.c:53
+#: ../libnm-core/nm-crypto-nss.c:82
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "暗号化エンジンの初期化に失敗しました: %d。"
 
-#: ../libnm-core/nm-crypto-nss.c:148 ../libnm-util/crypto_nss.c:181
+#: ../libnm-core/nm-crypto-nss.c:148
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "復号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:158 ../libnm-util/crypto_nss.c:191
+#: ../libnm-core/nm-crypto-nss.c:158
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "復号化用シンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:168 ../libnm-util/crypto_nss.c:201
+#: ../libnm-core/nm-crypto-nss.c:168
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "復号化用 IV の設定に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:176 ../libnm-util/crypto_nss.c:209
+#: ../libnm-core/nm-crypto-nss.c:176
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "復号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:192 ../libnm-util/crypto_nss.c:222
+#: ../libnm-core/nm-crypto-nss.c:192
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "プライベートキーの復号に失敗しました: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:200 ../libnm-util/crypto_nss.c:230
+#: ../libnm-core/nm-crypto-nss.c:200
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "プライベートキーの復号に失敗しました: 復号したデータが大きすぎます。"
 
-#: ../libnm-core/nm-crypto-nss.c:211 ../libnm-util/crypto_nss.c:241
+#: ../libnm-core/nm-crypto-nss.c:211
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "プライベートキー復号化の完了に失敗しました: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:300 ../libnm-util/crypto_nss.c:345
+#: ../libnm-core/nm-crypto-nss.c:300
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "暗号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:308 ../libnm-util/crypto_nss.c:353
+#: ../libnm-core/nm-crypto-nss.c:308
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "暗号化用のシンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:316 ../libnm-util/crypto_nss.c:361
+#: ../libnm-core/nm-crypto-nss.c:316
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "暗号化用の IV の設定に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:324 ../libnm-util/crypto_nss.c:369
+#: ../libnm-core/nm-crypto-nss.c:324
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "暗号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-core/nm-crypto-nss.c:347 ../libnm-util/crypto_nss.c:377
+#: ../libnm-core/nm-crypto-nss.c:347
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "暗号化に失敗しました: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:355 ../libnm-util/crypto_nss.c:385
+#: ../libnm-core/nm-crypto-nss.c:355
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "暗号化の後に予期しないデータの量があります。"
 
-#: ../libnm-core/nm-crypto-nss.c:393 ../libnm-util/crypto_nss.c:425
+#: ../libnm-core/nm-crypto-nss.c:393
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "証明書のデコードができません: %d"
@@ -10789,551 +10799,527 @@ msgstr "パスワードは UTF-8 である必要があります"
 msgid "Couldn't initialize slot"
 msgstr "スロットを初期化できませんでした"
 
-#: ../libnm-core/nm-crypto-nss.c:470 ../libnm-util/crypto_nss.c:489
+#: ../libnm-core/nm-crypto-nss.c:470
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 デコーダーを初期化できません: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:479 ../libnm-util/crypto_nss.c:498
+#: ../libnm-core/nm-crypto-nss.c:479
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ファイルをデコードできません: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:488 ../libnm-util/crypto_nss.c:507
+#: ../libnm-core/nm-crypto-nss.c:488
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ファイルを確証できません: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:538 ../libnm-util/crypto_nss.c:551
+#: ../libnm-core/nm-crypto-nss.c:538
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:301
+#: ../libnm-core/nm-connection.c:322
 msgid "wrong type; should be a list of strings."
 msgstr "正しくないタイプ; 文字列のリストである必要があります。"
 
-#: ../libnm-core/nm-connection.c:371
+#: ../libnm-core/nm-connection.c:392
 msgid "unknown setting name"
 msgstr "不明な設定名"
 
-#: ../libnm-core/nm-connection.c:383
+#: ../libnm-core/nm-connection.c:404
 msgid "duplicate setting name"
 msgstr "重複する設定名"
 
-#: ../libnm-core/nm-connection.c:1366
+#: ../libnm-core/nm-connection.c:1415
 msgid "setting not found"
 msgstr "設定が見つかりません"
 
-#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457
-#: ../libnm-core/nm-connection.c:1482
+#: ../libnm-core/nm-connection.c:1481 ../libnm-core/nm-connection.c:1506
+#: ../libnm-core/nm-connection.c:1531
 msgid "setting is required for non-slave connections"
 msgstr "設定は非スレーブ接続で必要です"
 
-#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470
-#: ../libnm-core/nm-connection.c:1495
+#: ../libnm-core/nm-connection.c:1494 ../libnm-core/nm-connection.c:1519
+#: ../libnm-core/nm-connection.c:1544
 msgid "setting not allowed in slave connection"
 msgstr "設定がスレーブ接続で許可されません"
 
-#: ../libnm-core/nm-connection.c:1585
+#: ../libnm-core/nm-connection.c:1634
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確認するときの予期しない障害"
 
-#: ../libnm-core/nm-connection.c:1630
+#: ../libnm-core/nm-connection.c:1681
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正規化するときの予期しない障害"
 
-#: ../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
-#: ../libnm-core/nm-setting-8021x.c:2720 ../libnm-core/nm-setting-8021x.c:2744
-#: ../libnm-core/nm-setting-8021x.c:2826 ../libnm-core/nm-setting-adsl.c:187
-#: ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-bluetooth.c:194
-#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
-#: ../libnm-core/nm-setting-connection.c:947
-#: ../libnm-core/nm-setting-connection.c:990
-#: ../libnm-core/nm-setting-connection.c:1156
-#: ../libnm-core/nm-setting-ip-config.c:2492
-#: ../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: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
-#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
-#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
-#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
-#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
-#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
-#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
-#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
-#: ../libnm-util/nm-setting-connection.c:765
-#: ../libnm-util/nm-setting-connection.c:781
-#: ../libnm-util/nm-setting-connection.c:842
-#: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:831
-#: ../libnm-util/nm-setting-ip6-config.c:897
-#: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
-#: ../libnm-util/nm-setting-wimax.c:149
-#: ../libnm-util/nm-setting-wireless-security.c:890
-#: ../libnm-util/nm-setting-wireless.c:768
+#: ../libnm-core/nm-connection.c:2375 ../libnm-core/nm-setting-8021x.c:2569
+#: ../libnm-core/nm-setting-8021x.c:2586 ../libnm-core/nm-setting-8021x.c:2617
+#: ../libnm-core/nm-setting-8021x.c:2634 ../libnm-core/nm-setting-8021x.c:2676
+#: ../libnm-core/nm-setting-8021x.c:2688 ../libnm-core/nm-setting-8021x.c:2706
+#: ../libnm-core/nm-setting-8021x.c:2718 ../libnm-core/nm-setting-8021x.c:2742
+#: ../libnm-core/nm-setting-8021x.c:2824 ../libnm-core/nm-setting-adsl.c:174
+#: ../libnm-core/nm-setting-bluetooth.c:125
+#: ../libnm-core/nm-setting-bluetooth.c:183
+#: ../libnm-core/nm-setting-bluetooth.c:197 ../libnm-core/nm-setting-cdma.c:144
+#: ../libnm-core/nm-setting-connection.c:931
+#: ../libnm-core/nm-setting-connection.c:974
+#: ../libnm-core/nm-setting-connection.c:1140
+#: ../libnm-core/nm-setting-ip-config.c:4816
+#: ../libnm-core/nm-setting-ip-tunnel.c:374
+#: ../libnm-core/nm-setting-olpc-mesh.c:99
+#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:146
+#: ../libnm-core/nm-setting-vpn.c:531 ../libnm-core/nm-setting-vxlan.c:339
+#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:110
+#: ../libnm-core/nm-setting-wireless-security.c:914
+#: ../libnm-core/nm-setting-wireless.c:737
 msgid "property is missing"
 msgstr "プロパティーがありません"
 
-#: ../libnm-core/nm-connection.c:2379
+#: ../libnm-core/nm-connection.c:2521
 msgid "IP Tunnel"
 msgstr "IP トンネル"
 
-#: ../libnm-core/nm-dbus-utils.c:202
+#: ../libnm-core/nm-dbus-utils.c:200
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
 
 #: ../libnm-core/nm-keyfile-utils.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "value is not an integer in range [%lld, %lld]"
-msgstr "'%s' は、[%lli, %lli] の範囲外です"
+msgstr "値は、[%lld, %lld] の範囲の整数ではありません"
 
-#: ../libnm-core/nm-keyfile.c:210
+#: ../libnm-core/nm-keyfile.c:211
 msgid "ignoring missing number"
 msgstr "不明な数字を無視"
 
-#: ../libnm-core/nm-keyfile.c:218
+#: ../libnm-core/nm-keyfile.c:219
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効な数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:239
+#: ../libnm-core/nm-keyfile.c:240
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効な %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:281
+#: ../libnm-core/nm-keyfile.c:282
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile.c:302
+#: ../libnm-core/nm-keyfile.c:303
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効な %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:427
+#: ../libnm-core/nm-keyfile.c:428
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:437
+#: ../libnm-core/nm-keyfile.c:438
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:446
+#: ../libnm-core/nm-keyfile.c:447
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:457
+#: ../libnm-core/nm-keyfile.c:458
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s の後のガベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:463
+#: ../libnm-core/nm-keyfile.c:464
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s の後の非推奨のセミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:478
+#: ../libnm-core/nm-keyfile.c:479
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile.c:485
+#: ../libnm-core/nm-keyfile.c:486
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
 
-#: ../libnm-core/nm-keyfile.c:748
+#: ../libnm-core/nm-keyfile.c:814 ../libnm-core/nm-setting-user.c:374
+#, c-format
+msgid "invalid value for \"%s\": %s"
+msgstr "'%s' の無効な値: %s"
+
+#: ../libnm-core/nm-keyfile.c:852
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "無効な DNS サーバー IPv%c アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:844 ../libnm-core/nm-keyfile.c:2734
+#: ../libnm-core/nm-keyfile.c:948 ../libnm-core/nm-keyfile.c:3075
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile.c:855
+#: ../libnm-core/nm-keyfile.c:959
 msgid "ignoring invalid MAC address"
 msgstr "有効な MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile.c:1105
+#: ../libnm-core/nm-keyfile.c:1217
 msgid "ignoring invalid SSID"
 msgstr "無効な SSID を無視"
 
-#: ../libnm-core/nm-keyfile.c:1121
+#: ../libnm-core/nm-keyfile.c:1233
 msgid "ignoring invalid raw password"
 msgstr "無効な生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile.c:1258
+#: ../libnm-core/nm-keyfile.c:1370
 msgid "invalid key/cert value"
 msgstr "無効なキー/証明書値"
 
-#: ../libnm-core/nm-keyfile.c:1269
+#: ../libnm-core/nm-keyfile.c:1381
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効なキー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368
+#: ../libnm-core/nm-keyfile.c:1397 ../libnm-core/nm-keyfile.c:1480
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "証明書またはキーファイル '%s' が存在しません"
 
-#: ../libnm-core/nm-keyfile.c:1294
+#: ../libnm-core/nm-keyfile.c:1406
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "無効な PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1338
+#: ../libnm-core/nm-keyfile.c:1450
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
 
-#: ../libnm-core/nm-keyfile.c:1347
+#: ../libnm-core/nm-keyfile.c:1459
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効なキー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1380
+#: ../libnm-core/nm-keyfile.c:1492
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効なキー/証明書値は、有効なブロブではありません"
 
-#: ../libnm-core/nm-keyfile.c:1482
+#: ../libnm-core/nm-keyfile.c:1594
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効なパリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1611 ../libnm-core/nm-keyfile.c:3130
+#, c-format
 msgid "invalid setting: %s"
-msgstr "無効な設定名 '%s'"
+msgstr "無効な設定: %s"
 
-#: ../libnm-core/nm-keyfile.c:1514
+#: ../libnm-core/nm-keyfile.c:1628
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "無効な team 設定を無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:1557
+#: ../libnm-core/nm-keyfile.c:1706
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "無効な qdisc: %s"
 
-#: ../libnm-core/nm-keyfile.c:1605
+#: ../libnm-core/nm-keyfile.c:1752
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "無効な tfilter: %s"
 
-#: ../libnm-core/nm-keyfile.c:2634
+#: ../libnm-core/nm-keyfile.c:2974
 #, c-format
 msgid "error loading setting value: %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
+#: ../libnm-core/nm-keyfile.c:3002 ../libnm-core/nm-keyfile.c:3013
+#: ../libnm-core/nm-keyfile.c:3031 ../libnm-core/nm-keyfile.c:3042
+#: ../libnm-core/nm-keyfile.c:3053 ../libnm-core/nm-keyfile.c:3105
+#: ../libnm-core/nm-keyfile.c:3116
 msgid "value cannot be interpreted as integer"
-msgstr ""
+msgstr "値は整数として解釈できません"
 
-#: ../libnm-core/nm-keyfile.c:2810
+#: ../libnm-core/nm-keyfile.c:3151
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効な設定名 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:2855
+#: ../libnm-core/nm-keyfile.c:3196
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "無効なキー '%s.%s'"
 
-#: ../libnm-core/nm-keyfile.c:2870
+#: ../libnm-core/nm-keyfile.c:3211
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "キー '%s.%s' はブール値ではありません"
 
-#: ../libnm-core/nm-setting-6lowpan.c:104
+#: ../libnm-core/nm-keyfile.c:3268
+#, c-format
+msgid "invalid peer public key in section '%s'"
+msgstr "セクション '%s' のピア公開鍵が無効です"
+
+#: ../libnm-core/nm-keyfile.c:3280
+#, c-format
+msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
+msgstr ""
+"キー '%s.%s' は、base64 エンコードにおける有効な 256 ビットキーではありません"
+
+#: ../libnm-core/nm-keyfile.c:3293
+#, c-format
+msgid "key '%s.%s' is not a valid secret flag"
+msgstr "キー '%s.%s' は、有効なシークレットフラグではありません"
+
+#: ../libnm-core/nm-keyfile.c:3305
+#, c-format
+msgid "key '%s.%s' is not a integer in range 0 to 2^32"
+msgstr "キー '%s.%s' は、0 から 2^32 の範囲の整数ではありません"
+
+#: ../libnm-core/nm-keyfile.c:3317
+#, c-format
+msgid "key '%s.%s' is not a valid endpoint"
+msgstr "キー '%s.%s' は、有効なエンドポイントではありません"
+
+#: ../libnm-core/nm-keyfile.c:3339
+#, c-format
+msgid "key '%s.%s' has invalid allowed-ips"
+msgstr "キー '%s.%s' の allowed-ips は無効です"
+
+#: ../libnm-core/nm-keyfile.c:3351
+#, c-format
+msgid "peer '%s' is invalid: %s"
+msgstr "ピア '%s' は無効です: %s"
+
+#: ../libnm-core/nm-setting-6lowpan.c:93
 #, c-format
 msgid "property is not specified"
 msgstr "プロパティーは指定されていません"
 
-#: ../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
+#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:302
+#: ../libnm-core/nm-setting-vlan.c:615
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 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: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
+#: ../libnm-core/nm-setting-6lowpan.c:126
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-macsec.c:313 ../libnm-core/nm-setting-macvlan.c:143
+#: ../libnm-core/nm-setting-vlan.c:626 ../libnm-core/nm-setting-vxlan.c:382
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
 
-#: ../libnm-core/nm-setting-8021x.c:229
+#: ../libnm-core/nm-setting-8021x.c:227
 msgid "binary data missing"
 msgstr "バイナリーデータがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:257
+#: ../libnm-core/nm-setting-8021x.c:255
 msgid "URI not NUL terminated"
 msgstr "URI が NUL でないため終了しました"
 
-#: ../libnm-core/nm-setting-8021x.c:266
+#: ../libnm-core/nm-setting-8021x.c:264
 msgid "URI is empty"
 msgstr "URI が空です"
 
-#: ../libnm-core/nm-setting-8021x.c:274
+#: ../libnm-core/nm-setting-8021x.c:272
 msgid "URI is not valid UTF-8"
 msgstr "URI が有効な UTF-8 ではありません"
 
-#: ../libnm-core/nm-setting-8021x.c:292
+#: ../libnm-core/nm-setting-8021x.c:290
 msgid "data missing"
 msgstr "データがありません"
 
-#: ../libnm-core/nm-setting-8021x.c:315 ../libnm-core/nm-setting-8021x.c:682
+#: ../libnm-core/nm-setting-8021x.c:313 ../libnm-core/nm-setting-8021x.c:680
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "証明書が無効です: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:323
+#: ../libnm-core/nm-setting-8021x.c:321
 #, c-format
 msgid "certificate detected as invalid scheme"
 msgstr "証明書が無効なスキームと検出されました"
 
-#: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:535
 msgid "CA certificate must be in X.509 format"
 msgstr "CA 証明書は X.509 形式である必要があります"
 
-#: ../libnm-core/nm-setting-8021x.c:553 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
+#: ../libnm-core/nm-setting-8021x.c:551
 msgid "invalid certificate format"
 msgstr "無効な証明書形式"
 
-#: ../libnm-core/nm-setting-8021x.c:692
+#: ../libnm-core/nm-setting-8021x.c:690
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr "証明書が PKCS#11 トークンにない場合は、パスワードはサポートされません"
 
-#: ../libnm-core/nm-setting-8021x.c:2578 ../libnm-core/nm-setting-8021x.c:2595
-#: ../libnm-core/nm-setting-8021x.c:2626 ../libnm-core/nm-setting-8021x.c:2643
-#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2696
-#: ../libnm-core/nm-setting-8021x.c:2714 ../libnm-core/nm-setting-8021x.c:2726
-#: ../libnm-core/nm-setting-8021x.c:2751 ../libnm-core/nm-setting-adsl.c:194
-#: ../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: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: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: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
-#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
-#: ../libnm-util/nm-setting-cdma.c:177
-#: ../libnm-util/nm-setting-connection.c:772
-#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
-#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
-#: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
-#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
-#: ../libnm-util/nm-setting-wimax.c:158
-#: ../libnm-util/nm-setting-wireless-security.c:920
-#: ../libnm-util/nm-setting-wireless-security.c:944
+#: ../libnm-core/nm-setting-8021x.c:2576 ../libnm-core/nm-setting-8021x.c:2593
+#: ../libnm-core/nm-setting-8021x.c:2624 ../libnm-core/nm-setting-8021x.c:2641
+#: ../libnm-core/nm-setting-8021x.c:2682 ../libnm-core/nm-setting-8021x.c:2694
+#: ../libnm-core/nm-setting-8021x.c:2712 ../libnm-core/nm-setting-8021x.c:2724
+#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:181
+#: ../libnm-core/nm-setting-cdma.c:151 ../libnm-core/nm-setting-cdma.c:160
+#: ../libnm-core/nm-setting-connection.c:938
+#: ../libnm-core/nm-setting-connection.c:986 ../libnm-core/nm-setting-gsm.c:286
+#: ../libnm-core/nm-setting-gsm.c:343 ../libnm-core/nm-setting-gsm.c:380
+#: ../libnm-core/nm-setting-gsm.c:389 ../libnm-core/nm-setting-ip-config.c:4823
+#: ../libnm-core/nm-setting-ip4-config.c:183
+#: ../libnm-core/nm-setting-ip4-config.c:190
+#: ../libnm-core/nm-setting-pppoe.c:153 ../libnm-core/nm-setting-pppoe.c:162
+#: ../libnm-core/nm-setting-vpn.c:540 ../libnm-core/nm-setting-vpn.c:550
+#: ../libnm-core/nm-setting-wimax.c:119
+#: ../libnm-core/nm-setting-wireless-security.c:944
+#: ../libnm-core/nm-setting-wireless-security.c:968
+#: ../libnm-core/nm-setting.c:1342
 msgid "property is empty"
 msgstr "プロパティーが空です"
 
-#: ../libnm-core/nm-setting-8021x.c:2608 ../libnm-core/nm-setting-8021x.c:2656
-#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
-#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
+#: ../libnm-core/nm-setting-8021x.c:2606 ../libnm-core/nm-setting-8021x.c:2654
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりません"
 
-#: ../libnm-core/nm-setting-8021x.c:2835
-#: ../libnm-core/nm-setting-bluetooth.c:121
-#: ../libnm-core/nm-setting-infiniband.c:190
-#: ../libnm-core/nm-setting-infiniband.c:205
-#: ../libnm-core/nm-setting-ip4-config.c:187
-#: ../libnm-core/nm-setting-ip6-config.c:235
-#: ../libnm-core/nm-setting-ip6-config.c:246
-#: ../libnm-core/nm-setting-olpc-mesh.c:147
-#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
-#: ../libnm-core/nm-setting-wired.c:686
-#: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1000
-#: ../libnm-core/nm-setting-wireless-security.c:1009
-#: ../libnm-core/nm-setting-wireless-security.c:1045
-#: ../libnm-core/nm-setting-wireless-security.c:1055
-#: ../libnm-core/nm-setting-wireless-security.c:1078
-#: ../libnm-core/nm-setting-wireless-security.c:1103
-#: ../libnm-core/nm-setting-wireless-security.c:1130
-#: ../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: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
-#: ../libnm-util/nm-setting-bluetooth.c:150
-#: ../libnm-util/nm-setting-infiniband.c:205
-#: ../libnm-util/nm-setting-infiniband.c:221
-#: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:888
-#: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
-#: ../libnm-util/nm-setting-wired.c:666
-#: ../libnm-util/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:1017
-#: ../libnm-util/nm-setting-wireless-security.c:1027
-#: ../libnm-util/nm-setting-wireless.c:828
-#: ../libnm-util/nm-setting-wireless.c:837
-#: ../libnm-util/nm-setting-wireless.c:846
+#: ../libnm-core/nm-setting-8021x.c:2833
+#: ../libnm-core/nm-setting-bluetooth.c:110
+#: ../libnm-core/nm-setting-infiniband.c:178
+#: ../libnm-core/nm-setting-infiniband.c:188
+#: ../libnm-core/nm-setting-ip4-config.c:174
+#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:233
+#: ../libnm-core/nm-setting-olpc-mesh.c:128
+#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:128
+#: ../libnm-core/nm-setting-wired.c:800 ../libnm-core/nm-setting-wired.c:810
+#: ../libnm-core/nm-setting-wireless-security.c:987
+#: ../libnm-core/nm-setting-wireless-security.c:996
+#: ../libnm-core/nm-setting-wireless-security.c:1005
+#: ../libnm-core/nm-setting-wireless-security.c:1041
+#: ../libnm-core/nm-setting-wireless-security.c:1051
+#: ../libnm-core/nm-setting-wireless-security.c:1074
+#: ../libnm-core/nm-setting-wireless-security.c:1112
+#: ../libnm-core/nm-setting-wireless-security.c:1153
+#: ../libnm-core/nm-setting-wireless.c:798
+#: ../libnm-core/nm-setting-wireless.c:807
+#: ../libnm-core/nm-setting-wireless.c:818 ../libnm-core/nm-setting-wpan.c:176
+#: ../libnm-core/nm-utils.c:4511
 msgid "property is invalid"
 msgstr "プロパティーが無効です"
 
-#: ../libnm-core/nm-setting-8021x.c:2862 ../libnm-core/nm-setting-8021x.c:2874
-#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2915
-#: ../libnm-core/nm-setting-8021x.c:2930 ../libnm-core/nm-setting-adsl.c:206
-#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
-#: ../libnm-core/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
-#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
-#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
-#: ../libnm-util/nm-setting-wireless-security.c:899
+#: ../libnm-core/nm-setting-8021x.c:2860 ../libnm-core/nm-setting-8021x.c:2872
+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2913
+#: ../libnm-core/nm-setting-8021x.c:2928 ../libnm-core/nm-setting-adsl.c:193
+#: ../libnm-core/nm-setting-adsl.c:205 ../libnm-core/nm-setting-bluetooth.c:138
+#: ../libnm-core/nm-setting-wireless-security.c:923
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "'%s' はプロパティーの有効な値ではありません"
 
-#: ../libnm-core/nm-setting-8021x.c:2898
+#: ../libnm-core/nm-setting-8021x.c:2896
 msgid "invalid auth flags"
 msgstr "無効な auth フラグ"
 
-#: ../libnm-core/nm-setting-bluetooth.c:171
+#: ../libnm-core/nm-setting-bluetooth.c:160
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-bluetooth.c:217
+#: ../libnm-core/nm-setting-bluetooth.c:206
 #, c-format
 msgid "'%s' connection requires '%s' setting"
 msgstr "'%s' 接続には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
+#: ../libnm-core/nm-setting-bond.c:556
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "無効なオプション '%s'、またはその値 '%s' です"
 
-#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
+#: ../libnm-core/nm-setting-bond.c:581
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "設定できるのは '%s' と '%s' の一つのみです"
 
-#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
+#: ../libnm-core/nm-setting-bond.c:594
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "必須オプションの '%s' がありません"
 
-#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:604
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "'%s' は有効な '%s' の値ではありません"
 
-#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:618
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
 
-#: ../libnm-core/nm-setting-bond.c:641
+#: ../libnm-core/nm-setting-bond.c:633
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "'%s' は '%s' オプションに無効です: %s"
 
-#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
+#: ../libnm-core/nm-setting-bond.c:644
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
 
-#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
+#: ../libnm-core/nm-setting-bond.c:657
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "'%s=%s' は '%s' の有効な設定ではありません"
 
-#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
-#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
-#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
-#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:670 ../libnm-core/nm-setting-bond.c:679
+#: ../libnm-core/nm-setting-bond.c:699 ../libnm-core/nm-setting-bond.c:735
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr ""
 "'%s' オプションを使用する場合は、'%s' オプションを設定する必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
+#: ../libnm-core/nm-setting-bond.c:710
 #, c-format
 msgid "'%s' option is empty"
 msgstr "'%s' オプションが空白です"
 
-#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
+#: ../libnm-core/nm-setting-bond.c:722
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
+#: ../libnm-core/nm-setting-bond.c:750
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "'%s' オプションはモード '%s' でのみ有効です"
 
-#: ../libnm-core/nm-setting-bond.c:769
+#: ../libnm-core/nm-setting-bond.c:761
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "'%s' と '%s' の値は同じである必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:785
+#: ../libnm-core/nm-setting-bond.c:777
 #, c-format
 msgid "'%s' option should be string"
 msgstr "'%s' オプションは文字列である必要があります"
 
-#: ../libnm-core/nm-setting-bond.c:801
+#: ../libnm-core/nm-setting-bond.c:793
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "'%s' オプションは、'%s' モードでは有効ではありません。"
 
-#: ../libnm-core/nm-setting-bridge-port.c:125
+#: ../libnm-core/nm-setting-bridge-port.c:317
+#: ../libnm-core/nm-setting-ovs-bridge.c:150
 #: ../libnm-core/nm-setting-ovs-interface.c:259
 #: ../libnm-core/nm-setting-ovs-port.c:187
-#: ../libnm-core/nm-setting-ovs-bridge.c:150
-#: ../libnm-core/nm-setting-team-port.c:357
+#: ../libnm-core/nm-setting-team-port.c:319
 #, c-format
 msgid "missing setting"
 msgstr "不明な設定"
 
-#: ../libnm-core/nm-setting-bridge-port.c:136
+#: ../libnm-core/nm-setting-bridge-port.c:328
 #: ../libnm-core/nm-setting-ovs-interface.c:280
 #: ../libnm-core/nm-setting-ovs-port.c:208
-#: ../libnm-core/nm-setting-team-port.c:368
+#: ../libnm-core/nm-setting-team-port.c:330
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -11342,84 +11328,78 @@ msgstr ""
 "'%s' 設定の接続では、スレーブタイプは '%s' に設定する必要がありますが、'%s' "
 "に設定されています。"
 
-#: ../libnm-core/nm-setting-bridge.c:229 ../libnm-util/nm-setting-bridge.c:268
+#: ../libnm-core/nm-setting-bridge.c:912
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "値 '%d' は <%d-%d> の範囲外です"
 
-#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
-#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
-#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
-#: ../libnm-util/nm-setting-wired.c:690
+#: ../libnm-core/nm-setting-bridge.c:929 ../libnm-core/nm-setting-wired.c:774
+#: ../libnm-core/nm-setting-wired.c:839 ../libnm-core/nm-setting-wired.c:881
 msgid "is not a valid MAC address"
 msgstr "は有効な MAC アドレスではありません"
 
-#: ../libnm-core/nm-setting-bridge.c:287
+#: ../libnm-core/nm-setting-bridge.c:970
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "マスクには、ビット 0 (STP)、1 (MAC)、または 2 (LACP) を設定できません"
 
-#: ../libnm-core/nm-setting-connection.c:924
+#: ../libnm-core/nm-setting-connection.c:908
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "タイプ '%s' の接続には設定が必要です"
 
-#: ../libnm-core/nm-setting-connection.c:963
-#: ../libnm-util/nm-setting-connection.c:788
+#: ../libnm-core/nm-setting-connection.c:947
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' は有効な UUID ではありません"
 
-#: ../libnm-core/nm-setting-connection.c:1013
+#: ../libnm-core/nm-setting-connection.c:997
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "接続タイプ '%s' は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:1049
-#: ../libnm-util/nm-setting-connection.c:874
+#: ../libnm-core/nm-setting-connection.c:1033
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "不明なスレーブタイプ '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1060
-#: ../libnm-util/nm-setting-connection.c:884
+#: ../libnm-core/nm-setting-connection.c:1044
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
 
-#: ../libnm-core/nm-setting-connection.c:1081
-#: ../libnm-util/nm-setting-connection.c:894
+#: ../libnm-core/nm-setting-connection.c:1065
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "'%s' を '%s' なしで設定できません"
 
-#: ../libnm-core/nm-setting-connection.c:1095
+#: ../libnm-core/nm-setting-connection.c:1079
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "'%s' 接続は、'%s' ではなく '%s' にスレーブ化される必要があります"
 
-#: ../libnm-core/nm-setting-connection.c:1109
+#: ../libnm-core/nm-setting-connection.c:1093
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "測定値 %d は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:1120
-#: ../libnm-core/nm-setting-connection.c:1131
-#: ../libnm-core/nm-setting-connection.c:1144
+#: ../libnm-core/nm-setting-connection.c:1104
+#: ../libnm-core/nm-setting-connection.c:1115
+#: ../libnm-core/nm-setting-connection.c:1128
 #, c-format
 msgid "value %d is not valid"
 msgstr "値 %d は無効です"
 
-#: ../libnm-core/nm-setting-connection.c:1165
+#: ../libnm-core/nm-setting-connection.c:1149
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "プロパティータイプは '%s' に設定する必要があります"
 
-#: ../libnm-core/nm-setting-connection.c:1180
+#: ../libnm-core/nm-setting-connection.c:1164
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-connection.c:1190
+#: ../libnm-core/nm-setting-connection.c:1174
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -11428,38 +11408,36 @@ msgstr ""
 "'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
 "'%s' に設定する必要があります"
 
-#: ../libnm-core/nm-setting-connection.c:1207
+#: ../libnm-core/nm-setting-connection.c:1191
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr "'%s' に設定されている '%s' とのスレーブ接続には、'%s' 設定ができません"
 
-#: ../libnm-core/nm-setting-dcb.c:520 ../libnm-util/nm-setting-dcb.c:593
+#: ../libnm-core/nm-setting-dcb.c:508
 msgid "flags invalid"
 msgstr "フラグは無効です"
 
-#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
+#: ../libnm-core/nm-setting-dcb.c:517
 msgid "flags invalid - disabled"
 msgstr "フラグは無効です - 無効"
 
-#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
-#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
+#: ../libnm-core/nm-setting-dcb.c:543 ../libnm-core/nm-setting-dcb.c:592
 msgid "property invalid (not enabled)"
 msgstr "プロパティーは無効です (有効になっていません)"
 
-#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
+#: ../libnm-core/nm-setting-dcb.c:552
 msgid "element invalid"
 msgstr "エレメントは無効です"
 
-#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
+#: ../libnm-core/nm-setting-dcb.c:567
 msgid "sum not 100%"
 msgstr "合計が 100% ではありません"
 
-#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
-#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
+#: ../libnm-core/nm-setting-dcb.c:601 ../libnm-core/nm-setting-dcb.c:633
 msgid "property invalid"
 msgstr "プロパティーは無効です"
 
-#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
+#: ../libnm-core/nm-setting-dcb.c:623
 msgid "property missing"
 msgstr "プロパティーがありません"
 
@@ -11476,46 +11454,43 @@ msgstr "オフロード機能には、無効のバリアントタイプがあり
 msgid "unknown ethtool option '%s'"
 msgstr "不明な ethtool オプション '%s'"
 
-#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
+#: ../libnm-core/nm-setting-gsm.c:299
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "プロパティー値 '%s' が空白、または長過ぎます (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
+#: ../libnm-core/nm-setting-gsm.c:331
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
 
-#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
+#: ../libnm-core/nm-setting-gsm.c:357
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
 
-#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
+#: ../libnm-core/nm-setting-gsm.c:368
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../libnm-core/nm-setting-gsm.c:415
+#: ../libnm-core/nm-setting-gsm.c:402
 msgid "property is empty or wrong size"
 msgstr "プロパティーが空、または間違ったサイズです"
 
-#: ../libnm-core/nm-setting-gsm.c:425
+#: ../libnm-core/nm-setting-gsm.c:412
 msgid "property must contain only digits"
 msgstr "プロパティーには数字のみ含めることができます"
 
-#: ../libnm-core/nm-setting-infiniband.c:226
-#: ../libnm-util/nm-setting-infiniband.c:239
+#: ../libnm-core/nm-setting-infiniband.c:209
 msgid "Must specify a P_Key if specifying parent"
 msgstr "親を指定している場合は P_Key を指定する必要があります"
 
-#: ../libnm-core/nm-setting-infiniband.c:236
-#: ../libnm-util/nm-setting-infiniband.c:249
+#: ../libnm-core/nm-setting-infiniband.c:219
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 接続で親インターフェース名が指定されていませんでした"
 
-#: ../libnm-core/nm-setting-infiniband.c:274
-#: ../libnm-util/nm-setting-infiniband.c:285
+#: ../libnm-core/nm-setting-infiniband.c:257
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
@@ -11524,282 +11499,431 @@ msgstr ""
 "ソフトウェア infiniband デバイスのインターフェース名は '%s' であるか、未設定"
 "である必要があります (実際には '%s')"
 
-#: ../libnm-core/nm-setting-infiniband.c:289
+#: ../libnm-core/nm-setting-infiniband.c:281
 #, c-format
-msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
-"トランスポートモード '%s' の mtu は最大で %d にすることができますが、実際に"
-"は %d です"
+msgid "mtu can be at most %u but it is %u"
+msgstr "mtu は最大で %u になり得ますが、%u です"
 
-#: ../libnm-core/nm-setting-ip-config.c:133
+#: ../libnm-core/nm-setting-ip-config.c:136
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "不明な IPv4 アドレス"
 
-#: ../libnm-core/nm-setting-ip-config.c:133
+#: ../libnm-core/nm-setting-ip-config.c:136
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "不明な IPv6 アドレス"
 
-#: ../libnm-core/nm-setting-ip-config.c:138
+#: ../libnm-core/nm-setting-ip-config.c:141
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:138
+#: ../libnm-core/nm-setting-ip-config.c:141
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:153
+#: ../libnm-core/nm-setting-ip-config.c:156
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "無効な IPv4 アドレスプレフィックス '%u'"
 
-#: ../libnm-core/nm-setting-ip-config.c:153
+#: ../libnm-core/nm-setting-ip-config.c:156
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "無効な IPv6 アドレスプレフィックス '%u'"
 
-#: ../libnm-core/nm-setting-ip-config.c:168
+#: ../libnm-core/nm-setting-ip-config.c:171
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "無効なルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:421
+#: ../libnm-core/nm-setting-ip-config.c:1289
+#: ../libnm-core/nm-setting-sriov.c:418
 msgid "unknown attribute"
 msgstr "不明な属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:431
+#: ../libnm-core/nm-setting-ip-config.c:1299
+#: ../libnm-core/nm-setting-sriov.c:428
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "無効な属性タイプ '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1310
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "属性は IPv4 ルートには無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1311
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "属性は IPv6 ルートには無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
+#: ../libnm-core/nm-setting-ip-config.c:1327
+#: ../libnm-core/nm-setting-ip-config.c:1351
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "'%s' は有効な IPv4 アドレスではありません"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
+#: ../libnm-core/nm-setting-ip-config.c:1328
+#: ../libnm-core/nm-setting-ip-config.c:1352
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "'%s' は有効な IPv6 アドレスではありません"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
+#: ../libnm-core/nm-setting-ip-config.c:1342
 #, c-format
 msgid "invalid prefix %s"
 msgstr "無効なプレフィックス %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2512
+#: ../libnm-core/nm-setting-ip-config.c:2479
+msgid "invalid priority"
+msgstr "無効な優先度"
+
+#: ../libnm-core/nm-setting-ip-config.c:2490
+msgid "missing table"
+msgstr "テーブルがありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:2496
+msgid "invalid action"
+msgstr "無効なアクション "
+
+#: ../libnm-core/nm-setting-ip-config.c:2503
+msgid "has from/src but the prefix-length is zero"
+msgstr "from/src があっても、プレフィックス長はゼロです"
+
+#: ../libnm-core/nm-setting-ip-config.c:2510
+msgid "missing from/src for a non zero prefix-length"
+msgstr "ゼロではないプレフィックス長には from/src がありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:2515
+msgid "invalid from/src"
+msgstr "無効な from/src"
+
+#: ../libnm-core/nm-setting-ip-config.c:2520
+msgid "invalid prefix length for from/src"
+msgstr "from/src のプレフィックス長は無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2527
+msgid "has to/dst but the prefix-length is zero"
+msgstr "to/dst があっても、プレフィックス長はゼロです"
+
+#: ../libnm-core/nm-setting-ip-config.c:2534
+msgid "missing to/dst for a non zero prefix-length"
+msgstr "ゼロではないプレフィックス長には to/dst がありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:2539
+msgid "invalid to/dst"
+msgstr "無効な to/dst"
+
+#: ../libnm-core/nm-setting-ip-config.c:2544
+msgid "invalid prefix length for to/dst"
+msgstr "to/dst のプレフィックス長は無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2552
+msgid "invalid iifname"
+msgstr "無効な iifname"
+
+#: ../libnm-core/nm-setting-ip-config.c:2560
+msgid "invalid oifname"
+msgstr "無効な oifname"
+
+#: ../libnm-core/nm-setting-ip-config.c:2566
+msgid "invalid source port range"
+msgstr "ソースポートの範囲が無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2572
+msgid "invalid destination port range"
+msgstr "接続先ポートの範囲が無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2676
+#, c-format
+msgid "duplicate key %s"
+msgstr "重複キー %s"
+
+#: ../libnm-core/nm-setting-ip-config.c:2690
+#, c-format
+msgid "invalid key \"%s\""
+msgstr "無効なキー \"%s\""
+
+#: ../libnm-core/nm-setting-ip-config.c:2703
+#, c-format
+msgid "invalid variant type '%s' for \"%s\""
+msgstr "\"%s\" のバリアントタイプ '%s' が無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2712
+msgid "missing \""
+msgstr "\" がありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:2718
+msgid "invalid \""
+msgstr "\" は無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:2909
+msgid "Unsupported to-string-flags argument"
+msgstr "to-string-flags 引数はサポートされていません"
+
+#: ../libnm-core/nm-setting-ip-config.c:2916
+msgid "Unsupported extra-argument"
+msgstr "サポートなしの追加の引数"
+
+#: ../libnm-core/nm-setting-ip-config.c:3161
+#, c-format
+msgid "unsupported key \"%s\""
+msgstr "サポートされていないキー \"%s\""
+
+#: ../libnm-core/nm-setting-ip-config.c:3166
+#, c-format
+msgid "duplicate key \"%s\""
+msgstr "重複キー \"%s\""
+
+#: ../libnm-core/nm-setting-ip-config.c:3171
+#, c-format
+msgid "invalid value for \"%s\""
+msgstr "\"%s\" の値は無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:3181
+msgid "empty text does not describe a rule"
+msgstr "空のテキストはルールを説明していません"
+
+#: ../libnm-core/nm-setting-ip-config.c:3187
+#, c-format
+msgid "missing argument for \"%s\""
+msgstr "\"%s\" の引数がありません"
+
+#: ../libnm-core/nm-setting-ip-config.c:3199
+msgid "invalid \"from\" part"
+msgstr "\"from\" の部分が無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:3213
+msgid "invalid \"to\" part"
+msgstr "\"to\" の部分が無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:3222
+#, c-format
+msgid "cannot detect address family for rule"
+msgstr "ルールのアドレスファミリーを検出できません"
+
+#: ../libnm-core/nm-setting-ip-config.c:3279
+#: ../libnm-core/nm-setting-ip-config.c:3373
+#, c-format
+msgid "rule is invalid: %s"
+msgstr "ルールが無効です: %s"
+
+#: ../libnm-core/nm-setting-ip-config.c:3356
+msgid "invalid address family"
+msgstr "アドレスファミリーが無効です"
+
+#: ../libnm-core/nm-setting-ip-config.c:4618
+#, c-format
+msgid "rule #%u is invalid: %s"
+msgstr "ルール #%u は無効です: %s"
+
+#: ../libnm-core/nm-setting-ip-config.c:4836
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS サーバーアドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2528
+#: ../libnm-core/nm-setting-ip-config.c:4852
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2540
+#: ../libnm-core/nm-setting-ip-config.c:4864
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP アドレスには、無効なタイプの 'label' プロパティーがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2549
+#: ../libnm-core/nm-setting-ip-config.c:4873
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP アドレスには、無効なラベル '%s' があります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:4887
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2572
+#: ../libnm-core/nm-setting-ip-config.c:4896
 msgid "gateway is invalid"
 msgstr "ゲートウェイが無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2586
+#: ../libnm-core/nm-setting-ip-config.c:4910
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルートは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2595
+#: ../libnm-core/nm-setting-ip-config.c:4919
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. ルートをデフォルトルートにすることはできません"
 
-#: ../libnm-core/nm-setting-ip-config.c:2606
+#: ../libnm-core/nm-setting-ip-config.c:4935
+#, c-format
+msgid "%u. rule has wrong address-family"
+msgstr "%u. ルールのアドレスファミリーは間違っています"
+
+#: ../libnm-core/nm-setting-ip-config.c:4944
+#, c-format
+msgid "%u. rule is invalid: %s"
+msgstr "%u. ルールは無効です: %s"
+
+#: ../libnm-core/nm-setting-ip-config.c:4957
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "ゲートウェイは '%s' と互換性がありません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:141
-#: ../libnm-core/nm-setting-ip6-config.c:187
-#: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:841
+#: ../libnm-core/nm-setting-ip-tunnel.c:340
+#, c-format
+msgid "'%d' is not a valid tunnel mode"
+msgstr "'%d' は有効なトンネルモードではありません"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:363
+#: ../libnm-core/nm-setting-ip-tunnel.c:383
+#, c-format
+msgid "'%s' is not a valid IPv%c address"
+msgstr "'%s' は有効な IPv%c アドレスではありません"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:400
+msgid "tunnel keys can only be specified for GRE tunnels"
+msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:413
+#: ../libnm-core/nm-setting-ip-tunnel.c:429
+#, c-format
+msgid "'%s' is not a valid tunnel key"
+msgstr "'%s' は有効なトンネルキーではありません"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:441
+msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
+msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:454
+#, c-format
+msgid "some flags are invalid for the select mode: %s"
+msgstr "選択されたモードに対して一部のフラグは無効です: %s"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:468
+#, c-format
+msgid "wired setting not allowed for mode %s"
+msgstr "モード %s には有線設定が許可されていません"
+
+#: ../libnm-core/nm-setting-ip4-config.c:128
+#: ../libnm-core/nm-setting-ip6-config.c:174
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "'%s=%s' のこのプロパティーを空にすることはできません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:153
-#: ../libnm-core/nm-setting-ip4-config.c:163
-#: ../libnm-core/nm-setting-ip4-config.c:175
-#: ../libnm-core/nm-setting-ip6-config.c:202
-#: ../libnm-core/nm-setting-ip6-config.c:212
-#: ../libnm-core/nm-setting-ip6-config.c:222
-#: ../libnm-util/nm-setting-ip4-config.c:891
-#: ../libnm-util/nm-setting-ip4-config.c:901
-#: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:853
-#: ../libnm-util/nm-setting-ip6-config.c:863
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-core/nm-setting-ip4-config.c:140
+#: ../libnm-core/nm-setting-ip4-config.c:150
+#: ../libnm-core/nm-setting-ip4-config.c:162
+#: ../libnm-core/nm-setting-ip6-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:209
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "このプロパティーは '%s=%s' には許可されていません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:212
+#: ../libnm-core/nm-setting-ip4-config.c:199
 #, c-format
 msgid "'%s' is not a valid FQDN"
 msgstr "'%s' は有効な FQDN ではありません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:221
+#: ../libnm-core/nm-setting-ip4-config.c:208
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr "dhcp-hostname も設定されている場合は、プロパティーを設定できません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:233
+#: ../libnm-core/nm-setting-ip4-config.c:220
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
 msgstr "'%s=%s' では複数のアドレスは許可されていません"
 
-#: ../libnm-core/nm-setting-ip4-config.c:247
+#: ../libnm-core/nm-setting-ip4-config.c:234
 msgid "property should be TRUE when method is set to disabled"
 msgstr "メソッドが無効に設定されている場合は、プロパティーは TRUE にします"
 
-#: ../libnm-core/nm-setting-ip6-config.c:261
+#: ../libnm-core/nm-setting-ip6-config.c:248
 msgid "value is not a valid token"
-msgstr "値 は有効なトークンではありません"
+msgstr "値は有効なトークンではありません"
 
-#: ../libnm-core/nm-setting-ip6-config.c:272
+#: ../libnm-core/nm-setting-ip6-config.c:259
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "EUI64 アドレス生成モードでのみ、意味が通じます"
 
-#: ../libnm-core/nm-setting-ip6-config.c:283
+#: ../libnm-core/nm-setting-ip6-config.c:270
 msgid "invalid DUID"
 msgstr "無効な DUID"
 
-#: ../libnm-core/nm-setting-ip6-config.c:295
+#: ../libnm-core/nm-setting-ip6-config.c:282
 msgid "token is not in canonical form"
 msgstr "トークンが正規形式ではありません"
 
-#: ../libnm-core/nm-setting-ip6-config.c:307
+#: ../libnm-core/nm-setting-ip6-config.c:294
 msgid "property should be TRUE when method is set to ignore"
 msgstr "メソッドが ignore に設定されている場合は、プロパティーは TRUE にします"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
-#, c-format
-msgid "'%d' is not a valid tunnel mode"
-msgstr "'%d' は有効なトンネルモードではありません"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
-#, c-format
-msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s' は有効な IPv%c アドレスではありません"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
-msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
-#, c-format
-msgid "'%s' is not a valid tunnel key"
-msgstr "'%s' は有効なトンネルキーではありません"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
-msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
-#, c-format
-msgid "some flags are invalid for the select mode: %s"
-msgstr "選択されたモードに対して一部のフラグは無効です: %s"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
-#, c-format
-msgid "wired setting not allowed for mode %s"
-msgstr "モード %s には有線設定が許可されていません"
-
-#: ../libnm-core/nm-setting-macsec.c:258
+#: ../libnm-core/nm-setting-macsec.c:246
 msgid "the key is empty"
 msgstr "キーが空です"
 
-#: ../libnm-core/nm-setting-macsec.c:269
+#: ../libnm-core/nm-setting-macsec.c:257
 #, c-format
 msgid "the key must be %d characters"
 msgstr "キーは %d 文字にする必要があります"
 
-#: ../libnm-core/nm-setting-macsec.c:277
+#: ../libnm-core/nm-setting-macsec.c:265
 msgid "the key contains non-hexadecimal characters"
 msgstr "キーは 16 進数でない文字が含まれています"
 
-#: ../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
+#: ../libnm-core/nm-setting-macsec.c:327 ../libnm-core/nm-setting-macvlan.c:157
+#: ../libnm-core/nm-setting-vlan.c:640
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "プロパティーおよび '%s:%s' のいずれも指定されていません"
 
-#: ../libnm-core/nm-setting-macsec.c:360
+#: ../libnm-core/nm-setting-macsec.c:348
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP キー管理には '%s' 設定が必要です"
 
-#: ../libnm-core/nm-setting-macsec.c:369
+#: ../libnm-core/nm-setting-macsec.c:357
 msgid "must be either psk (0) or eap (1)"
-msgstr ""
+msgstr "PSK (0) または EAP (1) のいずれかでなければなりません"
 
-#: ../libnm-core/nm-setting-macsec.c:378
+#: ../libnm-core/nm-setting-macsec.c:366
 #, c-format
 msgid "invalid port %d"
 msgstr "無効なポート %d"
 
-#: ../libnm-core/nm-setting-macsec.c:389
+#: ../libnm-core/nm-setting-macsec.c:377
 msgid "only valid for psk mode"
-msgstr ""
+msgstr "PSK モードでのみ有効です"
 
-#: ../libnm-core/nm-setting-macvlan.c:186
+#: ../libnm-core/nm-setting-macvlan.c:168
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:128
-#: ../libnm-core/nm-setting-wireless.c:760
-#: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:777
+#: ../libnm-core/nm-setting-olpc-mesh.c:109
+#: ../libnm-core/nm-setting-wireless.c:747
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID の長さは範囲外 <1-32> バイトです"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:137
-#: ../libnm-core/nm-setting-wireless.c:800
-#: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:817
+#: ../libnm-core/nm-setting-olpc-mesh.c:118
+#: ../libnm-core/nm-setting-wireless.c:787
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "'%d' は無効なチャンネルです"
 
+#: ../libnm-core/nm-setting-ovs-bridge.c:159
+#, c-format
+msgid "A connection with a '%s' setting must not have a master."
+msgstr "'%s' 設定の接続では、マスターが必要ありません。"
+
+#: ../libnm-core/nm-setting-ovs-bridge.c:170
+#, c-format
+msgid "'%s' is not allowed in fail_mode"
+msgstr "'%s' は、fail_mode では利用できません。"
+
 #: ../libnm-core/nm-setting-ovs-interface.c:111
 #, c-format
 msgid "'%s' is not a valid interface type"
@@ -11862,7 +11986,7 @@ msgid "A connection with a '%s' setting must have a master."
 msgstr "'%s' 設定の接続ではマスターが必要です。"
 
 #: ../libnm-core/nm-setting-ovs-patch.c:104
-#: ../libnm-core/nm-setting-vxlan.c:373
+#: ../libnm-core/nm-setting-vxlan.c:354
 #, c-format
 msgid "'%s' is not a valid IP address"
 msgstr "'%s' は、有効な IP アドレスではありません"
@@ -11887,164 +12011,129 @@ msgstr "'%s' は、lacp では利用できません"
 msgid "'%s' is not allowed in bond_mode"
 msgstr "'%s' は、bond_mode では利用できません"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:159
-#, c-format
-msgid "A connection with a '%s' setting must not have a master."
-msgstr "'%s' 設定の接続では、マスターが必要ありません。"
-
-#: ../libnm-core/nm-setting-ovs-bridge.c:170
-#, c-format
-msgid "'%s' is not allowed in fail_mode"
-msgstr "'%s' は、fail_mode では利用できません。"
-
-#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
+#: ../libnm-core/nm-setting-ppp.c:352
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
 
-#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
+#: ../libnm-core/nm-setting-ppp.c:365
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr "このプロパティーを設定するにはゼロ以外の '%s' プロパティーが必要です"
 
-#: ../libnm-core/nm-setting-proxy.c:161
+#: ../libnm-core/nm-setting-proxy.c:148
 #, c-format
 msgid "invalid proxy method"
 msgstr "無効なプロキシメソッド"
 
-#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
+#: ../libnm-core/nm-setting-proxy.c:158 ../libnm-core/nm-setting-proxy.c:167
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "このプロパティーは、メソッド none には許可されていません"
 
-#: ../libnm-core/nm-setting-proxy.c:191
+#: ../libnm-core/nm-setting-proxy.c:178
 #, c-format
 msgid "the script is too large"
 msgstr "スクリプトが長すぎます"
 
-#: ../libnm-core/nm-setting-proxy.c:199
+#: ../libnm-core/nm-setting-proxy.c:186
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "スクリプトは有効な utf8 ではありません"
 
-#: ../libnm-core/nm-setting-proxy.c:207
+#: ../libnm-core/nm-setting-proxy.c:194
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "スクリプトには FindProxyForURL 関数がありません"
 
-#: ../libnm-core/nm-setting-sriov.c:1086
+#: ../libnm-core/nm-setting-sriov.c:1074
 #, c-format
 msgid "VF with index %u, but the total number of VFs is %u"
 msgstr "インデックス %u を持つ VF ですが、VF の総数は %u です"
 
-#: ../libnm-core/nm-setting-sriov.c:1097
+#: ../libnm-core/nm-setting-sriov.c:1085
 #, c-format
 msgid "invalid VF %u: %s"
 msgstr "無効な VF %u: %s"
 
-#: ../libnm-core/nm-setting-sriov.c:1109
+#: ../libnm-core/nm-setting-sriov.c:1097
 #, c-format
 msgid "duplicate VF index %u"
 msgstr "VF インデックス %u を複製します"
 
-#: ../libnm-core/nm-setting-sriov.c:1130
+#: ../libnm-core/nm-setting-sriov.c:1118
 #, c-format
 msgid "VFs %d and %d are not sorted by ascending index"
 msgstr "VFs %d および %d は、上昇するインデックスでソートされません"
 
-#: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:296
-#: ../libnm-core/nm-setting-tc-config.c:550
+#: ../libnm-core/nm-setting-tc-config.c:70
+#: ../libnm-core/nm-setting-tc-config.c:436
+#: ../libnm-core/nm-setting-tc-config.c:706
+#, c-format
+msgid "kind is missing"
+msgstr "kind がありません"
+
+#: ../libnm-core/nm-setting-tc-config.c:78
+#: ../libnm-core/nm-setting-tc-config.c:444
+#: ../libnm-core/nm-setting-tc-config.c:714
 #, c-format
 msgid "'%s' is not a valid kind"
-msgstr "'%s' は有効ではありません。"
+msgstr "'%s' は有効な kind ではありません。"
 
-#: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:558
+#: ../libnm-core/nm-setting-tc-config.c:86
+#: ../libnm-core/nm-setting-tc-config.c:722
 msgid "parent handle missing"
 msgstr "親ハンドラーがありません。"
 
-#: ../libnm-core/nm-setting-tc-config.c:1203
+#: ../libnm-core/nm-setting-tc-config.c:1292
 msgid "there are duplicate TC qdiscs"
 msgstr "複製 TC qdiscs があります"
 
-#: ../libnm-core/nm-setting-tc-config.c:1223
+#: ../libnm-core/nm-setting-tc-config.c:1312
 msgid "there are duplicate TC filters"
 msgstr "複製 TC フィルターがあります"
 
-#: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194
-#: ../libnm-core/nm-setting-team.c:306
+#: ../libnm-core/nm-setting-team.c:130 ../libnm-core/nm-setting-team.c:191
+#: ../libnm-core/nm-setting-team.c:313
 #, c-format
 msgid "%s is out of range [0, %d]"
 msgstr "%s は [0, %d] の範囲外です"
 
-#: ../libnm-core/nm-setting-team.c:176
+#: ../libnm-core/nm-setting-team.c:173
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr "nsna_ping リンクウォッチャーに target-host がありません"
 
-#: ../libnm-core/nm-setting-team.c:182 ../libnm-core/nm-setting-team.c:288
+#: ../libnm-core/nm-setting-team.c:179 ../libnm-core/nm-setting-team.c:295
 #, c-format
 msgid "target-host '%s' contains invalid characters"
 msgstr "target-host '%s' には無効な文字が含まれています。"
 
-#: ../libnm-core/nm-setting-team.c:281
+#: ../libnm-core/nm-setting-team.c:288
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
 msgstr "arp_ping リンクウォッチャーに %s がありません"
 
-#: ../libnm-core/nm-setting-team.c:294
+#: ../libnm-core/nm-setting-team.c:301
 #, c-format
 msgid "source-host '%s' contains invalid characters"
 msgstr "source-host '%s' に無効な文字が含まれています"
 
-#: ../libnm-core/nm-setting-team.c:312
-#, fuzzy
+#: ../libnm-core/nm-setting-team.c:319
 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:1246
-#, c-format
-msgid "invalid runner \"%s\""
-msgstr "無効なランナー \"%s\""
-
-#: ../libnm-core/nm-setting-team.c:1259
-#, c-format
-msgid "missing link watcher name"
-msgstr "リンクウォッチャー名がありません"
-
-#: ../libnm-core/nm-setting-team.c:1269
-#, c-format
-msgid "unknown link watcher \"%s\""
-msgstr "不明なリンクウォッチャー \"%s\""
+msgstr "vlanid は [-1, 4094] の範囲外です"
 
-#: ../libnm-core/nm-setting-team.c:1280
-#, c-format
-msgid "missing target host"
-msgstr "ターゲットホストがありません"
-
-#: ../libnm-core/nm-setting-team.c:1288
-#, c-format
-msgid "missing source address"
-msgstr "ソースアドレスがありません"
-
-#: ../libnm-core/nm-setting-tun.c:185
+#: ../libnm-core/nm-setting-tun.c:167
 #, c-format
 msgid "'%u': invalid mode"
 msgstr "'%u': 無効なモード"
 
-#: ../libnm-core/nm-setting-tun.c:195
+#: ../libnm-core/nm-setting-tun.c:177
 #, c-format
 msgid "'%s': invalid user ID"
 msgstr "'%s': 無効なユーザー ID"
 
-#: ../libnm-core/nm-setting-tun.c:206
+#: ../libnm-core/nm-setting-tun.c:188
 #, c-format
 msgid "'%s': invalid group ID"
 msgstr "'%s': 無効なグループ ID"
@@ -12094,393 +12183,571 @@ msgstr "ユーザーデータエントリーが最大数に達しました"
 msgid "invalid key \"%s\": %s"
 msgstr "無効なキー '%s': %s"
 
-#: ../libnm-core/nm-setting-user.c:374
-#, c-format
-msgid "invalid value for \"%s\": %s"
-msgstr "'%s' の無効な値: %s"
-
 #: ../libnm-core/nm-setting-user.c:389
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr "ユーザーデータエントリーが最大数に達しました (%u ではなく %u)"
 
-#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:651
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "vlan id は 0 - 4094 の範囲内である必要がありますが、%u です"
 
-#: ../libnm-core/nm-setting-vlan.c:678 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:661
 msgid "flags are invalid"
 msgstr "フラグが無効です"
 
-#: ../libnm-core/nm-setting-vlan.c:690
+#: ../libnm-core/nm-setting-vlan.c:673
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "vlan 設定には Ethernet 設定も必要です"
 
-#: ../libnm-core/nm-setting-vpn.c:580
+#: ../libnm-core/nm-setting-vpn.c:561
 msgid "cannot set connection.multi-connect for VPN setting"
 msgstr "VPN 設定用に connection.multi-connect を設定できません"
 
-#: ../libnm-core/nm-setting-vpn.c:601
+#: ../libnm-core/nm-setting-vpn.c:582
 #, c-format
 msgid "secret was empty"
 msgstr "シークレットが空です"
 
-#: ../libnm-core/nm-setting-vpn.c:631
+#: ../libnm-core/nm-setting-vpn.c:612
 msgid "setting contained a secret with an empty name"
 msgstr "設定に空の名前のシークレットが含まれていました"
 
-#: ../libnm-core/nm-setting-vpn.c:639
+#: ../libnm-core/nm-setting-vpn.c:620
 #, c-format
 msgid "secret value was empty"
 msgstr "シークレット値が空でした"
 
-#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024
+#: ../libnm-core/nm-setting-vpn.c:667 ../libnm-core/nm-setting.c:2211
 msgid "not a secret property"
 msgstr "シークレットプロパティーではありません"
 
-#: ../libnm-core/nm-setting-vpn.c:692
+#: ../libnm-core/nm-setting-vpn.c:673
 msgid "secret is not of correct type"
 msgstr "シークレットのタイプが正しくありません"
 
-#: ../libnm-core/nm-setting-vpn.c:725
-#, fuzzy
+#: ../libnm-core/nm-setting-vpn.c:757
 msgid "secret flags property not found"
-msgstr "シークレットフラグプロパティー '%s' が見つかりません"
+msgstr "シークレットフラグプロパティーが見つかりません"
 
-#: ../libnm-core/nm-setting-vxlan.c:386
+#: ../libnm-core/nm-setting-vxlan.c:367
 #, c-format
 msgid "'%s' is not a valid IP%c address"
 msgstr "'%s' は有効な IP%c アドレスではありません"
 
-#: ../libnm-core/nm-setting-vxlan.c:413
+#: ../libnm-core/nm-setting-vxlan.c:394
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d はローカルポートの最大 %d よりも大きいです"
 
-#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
+#: ../libnm-core/nm-setting-wired.c:754
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' は有効な Ethernet ポート値ではありません"
 
-#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
+#: ../libnm-core/nm-setting-wired.c:764
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "'%s' は有効な二重値ではありません"
 
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
+#: ../libnm-core/nm-setting-wired.c:826
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "無効な '%s' またはその値 '%s' です"
 
-#: ../libnm-core/nm-setting-wired.c:736
+#: ../libnm-core/nm-setting-wired.c:863
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグです"
 
-#: ../libnm-core/nm-setting-wired.c:745
+#: ../libnm-core/nm-setting-wired.c:872
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "Wake-on-LAN パスワードは、マジックパケットモードでのみ使用できます"
 
-#: ../libnm-core/nm-setting-wired.c:770
+#: ../libnm-core/nm-setting-wired.c:897
 msgid "both speed and duplex should have a valid value or both should be unset"
 msgstr ""
 "速度と二重の両方の値は有効であるべきで、そうでなければ、両方とも未設定でなけ"
 "ればなりません"
 
-#: ../libnm-core/nm-setting-wired.c:771
+#: ../libnm-core/nm-setting-wired.c:898
 msgid "both speed and duplex are required for static link configuration"
 msgstr "速度と二重の両方が静的リンク設定に必要です"
 
-#: ../libnm-core/nm-setting-wireless-security.c:939
-#: ../libnm-util/nm-setting-wireless-security.c:911
+#: ../libnm-core/nm-setting-wireguard.c:778
+msgid "missing public-key for peer"
+msgstr "ピアの公開鍵がありません"
+
+#: ../libnm-core/nm-setting-wireguard.c:782
+msgid "invalid public-key for peer"
+msgstr "ピアの公開鍵が無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:791
+msgid "invalid preshared-key for peer"
+msgstr "ピアの共有前のキーが無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:809
+msgid "invalid endpoint for peer"
+msgstr "ピアのエンドポイントが無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:819
+#, c-format
+msgid "invalid IP address \"%s\" for allowed-ip of peer"
+msgstr "ピアの allowed-ip の IP アドレス \"%s\" は無効です "
+
+#: ../libnm-core/nm-setting-wireguard.c:828
+msgid "invalid preshared-key-flags for peer"
+msgstr "ピアの共有前のキーフラグが無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:1567
+#, c-format
+msgid "peer #%u has no public-key"
+msgstr "ピア #%u には公開鍵がありません"
+
+#: ../libnm-core/nm-setting-wireguard.c:1578
+#, c-format
+msgid "peer #%u has invalid public-key"
+msgstr "ピア #%u の公開鍵は無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:1592
+#, c-format
+msgid "peer #%u has invalid endpoint"
+msgstr "ピア #%u のエンドポイントは無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:1622
+#, c-format
+msgid "peer #%u has invalid allowed-ips setting"
+msgstr "ピア #%u の allowed-ips 設定は無効です"
+
+#: ../libnm-core/nm-setting-wireguard.c:1634
+#, c-format
+msgid "peer #%u is invalid: %s"
+msgstr "ピア #%u は無効です: %s"
+
+#: ../libnm-core/nm-setting-wireguard.c:1705
+#: ../libnm-core/nm-setting-wireguard.c:1719
+#, c-format
+msgid "method \"%s\" is not supported for WireGuard"
+msgstr "メソッド \"%s\" は、WireGuard ではサポートしていません"
+
+#: ../libnm-core/nm-setting-wireguard.c:1739
+msgid "key must be 32 bytes base64 encoded"
+msgstr "キーは 32 バイトで base64 でエンコードされている必要があります"
+
+#: ../libnm-core/nm-setting-wireguard.c:1875
+msgid "invalid peer secrets"
+msgstr "無効なピアシークレット"
+
+#: ../libnm-core/nm-setting-wireguard.c:1898
+#, c-format
+msgid "peer #%u lacks public-key"
+msgstr "ピア #%u には公開鍵がありません"
+
+#: ../libnm-core/nm-setting-wireguard.c:1912
+#, c-format
+msgid "non-existing peer '%s'"
+msgstr "ピア '%s' は存在しません"
+
+#: ../libnm-core/nm-setting-wireless-security.c:935
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "'%s' セキュリティーには、'%s=%s' が必要です"
 
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-util/nm-setting-wireless-security.c:932
+#: ../libnm-core/nm-setting-wireless-security.c:956
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "'%s' セキュリティーには、'%s' の設定が必要になります"
 
-#: ../libnm-core/nm-setting-wireless-security.c:981
-#: ../libnm-util/nm-setting-wireless-security.c:953
+#: ../libnm-core/nm-setting-wireless-security.c:977
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' の値は <0-3> の範囲外になります"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1036
-#: ../libnm-util/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1032
 #, c-format
 msgid "'%s' connections require '%s' in this property"
 msgstr "'%s' の接続の場合、このプロパティーに '%s' が必要になります"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1066
-#: ../libnm-util/nm-setting-wireless-security.c:1038
+#: ../libnm-core/nm-setting-wireless-security.c:1062
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+#: ../libnm-core/nm-setting-wireless-security.c:1086
 #, c-format
-msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-msgstr "'%s' は、'%s=%s' または '%s=%s' でしか使用できません"
-
-#: ../libnm-core/nm-setting-wireless-security.c:1112
-msgid "can't be simultaneously disabled and enabled"
-msgstr "同時に無効または有効にすることはできません"
+msgid ""
+"'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
+msgstr ""
+"'%s' は、'wpa-eap'、'wpa-psk' または 'sae' のキー管理でのみ使用できます"
 
-#: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-wireless.c:756
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "'%s' は有効な Wi-Fi モードではありません"
 
-#: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:796
+#: ../libnm-core/nm-setting-wireless.c:766
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "'%s' は有効なバンドではありません"
 
-#: ../libnm-core/nm-setting-wireless.c:789
+#: ../libnm-core/nm-setting-wireless.c:776
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "'%s' の場合は、'%s' プロパティーを設定する必要があります"
 
-#: ../libnm-core/nm-setting-wireless.c:883
+#: ../libnm-core/nm-setting-wireless.c:870
 #, c-format
 msgid "invalid value"
 msgstr "無効な値"
 
-#: ../libnm-core/nm-setting-wireless.c:893
+#: ../libnm-core/nm-setting-wireless.c:880
 msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-WLAN モードの 'default' と 'ignore' は排他的なフラグです"
 
-#: ../libnm-core/nm-setting-wireless.c:902
+#: ../libnm-core/nm-setting-wireless.c:889
 msgid "Wake-on-WLAN trying to set unknown flag"
 msgstr "Wake-on-WLAN は、未知のフラグの設定を試みています"
 
-#: ../libnm-core/nm-setting-wireless.c:924
+#: ../libnm-core/nm-setting-wireless.c:911
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization と cloned-mac-address の値の競合"
 
-#: ../libnm-core/nm-setting-wpan.c:182
+#: ../libnm-core/nm-setting-wpan.c:185
 msgid "page must be defined along with a channel"
-msgstr ""
+msgstr "ページはチャンネルと共に定義される必要があります"
 
-#: ../libnm-core/nm-setting-wpan.c:191
+#: ../libnm-core/nm-setting-wpan.c:194
 #, c-format
 msgid "page must be between %d and %d"
-msgstr ""
+msgstr "ページは %d から %d の間でなければなりません"
 
-#: ../libnm-core/nm-setting-wpan.c:202
+#: ../libnm-core/nm-setting-wpan.c:205
 #, c-format
 msgid "channel must not be between %d and %d"
-msgstr ""
+msgstr "チャンネルは %d から %d の間であってはなりません"
 
-#: ../libnm-core/nm-setting.c:852
+#: ../libnm-core/nm-setting.c:906
 #, c-format
 msgid "duplicate property"
 msgstr "重複するプロパティー"
 
-#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947
+#: ../libnm-core/nm-setting.c:929
+#, c-format
+msgid "unknown property"
+msgstr "不明なプロパティー"
+
+#: ../libnm-core/nm-setting.c:1000 ../libnm-core/nm-setting.c:1049
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
 
-#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933
+#: ../libnm-core/nm-setting.c:1019 ../libnm-core/nm-setting.c:1034
 #, c-format
 msgid "failed to set property: %s"
 msgstr "プロパティーの設定に失敗しました: %s"
 
-#: ../libnm-core/nm-setting.c:961
+#: ../libnm-core/nm-setting.c:1064
 #, c-format
 msgid "can not set property: %s"
 msgstr "プロパティーを設定できません: %s"
 
-#: ../libnm-core/nm-setting.c:977
-#, c-format
-msgid "unknown property"
-msgstr "不明なプロパティー"
-
-#: ../libnm-core/nm-setting.c:1935
+#: ../libnm-core/nm-setting.c:2102
 msgid "secret not found"
 msgstr "シークレットが見つかりません"
 
-#: ../libnm-core/nm-utils.c:2045
+#: ../libnm-core/nm-team-utils.c:1241 ../libnm-core/nm-team-utils.c:1256
+#, fuzzy, c-format
+msgid "invalid D-Bus property \"%s\""
+msgstr "無効なランナー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:1266
+#, fuzzy, c-format
+msgid "duplicate D-Bus property \"%s\""
+msgstr "重複するプロパティー"
+
+#: ../libnm-core/nm-team-utils.c:1287
+#, fuzzy, c-format
+msgid "invalid D-Bus property \"%s\" for \"%s\""
+msgstr "%2$s の無効なファイル所有者 %1$d"
+
+#: ../libnm-core/nm-team-utils.c:1345
+#, fuzzy, c-format
+msgid "unknown link-watcher name \"%s\""
+msgstr "不明なリンクウォッチャー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:1903
+#, fuzzy, c-format
+msgid "missing runner"
+msgstr "キーがみつかりません"
+
+#: ../libnm-core/nm-team-utils.c:1915
+#, c-format
+msgid "invalid runner \"%s\""
+msgstr "無効なランナー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:1926
+#, fuzzy, c-format
+msgid "invalid runner.tx-hash"
+msgstr "無効なランナー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:1944
+#, c-format
+msgid "missing link watcher name"
+msgstr "リンクウォッチャー名がありません"
+
+#: ../libnm-core/nm-team-utils.c:1947
+#, c-format
+msgid "unknown link watcher \"%s\""
+msgstr "不明なリンクウォッチャー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:1958
+#, c-format
+msgid "missing target host"
+msgstr "ターゲットホストがありません"
+
+#: ../libnm-core/nm-team-utils.c:1965
+#, c-format
+msgid "missing source address"
+msgstr "ソースアドレスがありません"
+
+#: ../libnm-core/nm-team-utils.c:1978
+#, c-format
+msgid "team config exceeds size limit"
+msgstr "team 設定が制限サイズを超えています"
+
+#: ../libnm-core/nm-team-utils.c:1984
+#, fuzzy, c-format
+msgid "team config is not valid UTF-8"
+msgstr "URI が有効な UTF-8 ではありません"
+
+#: ../libnm-core/nm-team-utils.c:1990
+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:8969
+#, fuzzy, c-format
+msgid "invalid json"
+msgstr "無効なアクション: "
+
+#: ../libnm-core/nm-team-utils.c:2137
+#, fuzzy, c-format
+msgid "invalid D-Bus type \"%s\""
+msgstr "無効なランナー \"%s\""
+
+#: ../libnm-core/nm-team-utils.c:2162
+#, fuzzy, c-format
+msgid "invalid link-watchers: %s"
+msgstr "無効な tfilter: %s"
+
+#: ../libnm-core/nm-utils.c:2316
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "'%s' は有効なハンドラーはありません。"
 
-#: ../libnm-core/nm-utils.c:2141
+#: ../libnm-core/nm-utils.c:2444
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "予期せぬ '%s': 親はすでに選択されています。"
 
-#: ../libnm-core/nm-utils.c:2157
+#: ../libnm-core/nm-utils.c:2460
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "無効なハンドラー: '%s'"
 
-#: ../libnm-core/nm-utils.c:2179
+#: ../libnm-core/nm-utils.c:2482
 msgid "parent not specified."
 msgstr "親が指定されていません。"
 
-#: ../libnm-core/nm-utils.c:2226
+#: ../libnm-core/nm-utils.c:2544
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "サポートされていない qdisc オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2342
+#: ../libnm-core/nm-utils.c:2666
 msgid "action name missing."
 msgstr "アクション名がありません。"
 
-#: ../libnm-core/nm-utils.c:2366
+#: ../libnm-core/nm-utils.c:2692
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "サポートされていないアクションのオプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2504
+#: ../libnm-core/nm-utils.c:2830
 msgid "invalid action: "
 msgstr "無効なアクション: "
 
-#: ../libnm-core/nm-utils.c:2508
+#: ../libnm-core/nm-utils.c:2834
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "サポートされていない tfilter オプション: '%s'."
 
-#: ../libnm-core/nm-utils.c:3110
+#: ../libnm-core/nm-utils.c:3435
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
 
-#: ../libnm-core/nm-utils.c:3119
+#: ../libnm-core/nm-utils.c:3444
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3130
+#: ../libnm-core/nm-utils.c:3455
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "%2$s の無効なファイル所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:3141
+#: ../libnm-core/nm-utils.c:3466
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s のファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:3151
+#: ../libnm-core/nm-utils.c:3476
 #, c-format
 msgid "reject %s"
 msgstr "%s の拒否"
 
-#: ../libnm-core/nm-utils.c:3170
+#: ../libnm-core/nm-utils.c:3495
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パスが絶対パスではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3184
+#: ../libnm-core/nm-utils.c:3509
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイルが存在しません (%s)"
 
-#: ../libnm-core/nm-utils.c:3192
+#: ../libnm-core/nm-utils.c:3517
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグインが有効なファイルではありません (%s)"
 
-#: ../libnm-core/nm-utils.c:3202
+#: ../libnm-core/nm-utils.c:3527
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブはサポートされていません (%s)"
 
-#: ../libnm-core/nm-utils.c:3284 ../libnm-util/nm-utils.c:1794
+#: ../libnm-core/nm-utils.c:3609
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" バイナリーを見つけることができませんでした"
 
-#: ../libnm-core/nm-utils.c:4369
+#: ../libnm-core/nm-utils.c:4462
+msgid "unknown secret flags"
+msgstr "不明なシークレットフラグ"
+
+#: ../libnm-core/nm-utils.c:4472
+msgid "conflicting secret flags"
+msgstr "競合するシークレットフラグ"
+
+#: ../libnm-core/nm-utils.c:4483
+msgid "secret flags must not be \"not-required\""
+msgstr "シークレットフラグは \"not-required\" であってはなりません"
+
+#: ../libnm-core/nm-utils.c:4491
+msgid "unsupported secret flags"
+msgstr "サポートされていないシークレットフラグ"
+
+#: ../libnm-core/nm-utils.c:4521
+msgid "can't be simultaneously disabled and enabled"
+msgstr "同時に無効または有効にすることはできません"
+
+#: ../libnm-core/nm-utils.c:4529
+msgid "WPS is required"
+msgstr "WPS が必要です"
+
+#: ../libnm-core/nm-utils.c:4595
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "%lld の場所で、マスクに有効な Ethernet  MAC アドレスではありません"
 
-#: ../libnm-core/nm-utils.c:4384
+#: ../libnm-core/nm-utils.c:4610
 #, 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:4420
+#: ../libnm-core/nm-utils.c:4669
 msgid "interface name is too short"
 msgstr "インターフェース名が短すぎます"
 
-#: ../libnm-core/nm-utils.c:4429
+#: ../libnm-core/nm-utils.c:4678
 msgid "interface name is reserved"
 msgstr "インターフェース名が予約されています"
 
-#: ../libnm-core/nm-utils.c:4441
+#: ../libnm-core/nm-utils.c:4690
 msgid "interface name contains an invalid character"
 msgstr "インターフェース名に無効な文字が含まれています"
 
-#: ../libnm-core/nm-utils.c:4447
+#: ../libnm-core/nm-utils.c:4696
 msgid "interface name is longer than 15 characters"
 msgstr "インターフェース名が 15 文字を超えています"
 
-#: ../libnm-core/nm-utils.c:5107
+#: ../libnm-core/nm-utils.c:5356
 msgid "not valid utf-8"
 msgstr "utf-8 ではありません"
 
-#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601
+#: ../libnm-core/nm-utils.c:5377 ../libnm-core/nm-utils.c:5430
 msgid "is not a JSON object"
 msgstr "JSON オブジェクトではありません"
 
-#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is NULL"
 msgstr "値が NULL です"
 
-#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is empty"
 msgstr "値が空です"
 
-#: ../libnm-core/nm-utils.c:5589
+#: ../libnm-core/nm-utils.c:5418
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "%d (%s) で無効な JSON"
 
-#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264
+#: ../libnm-core/nm-utils.c:5538 ../libnm-core/nm-utils.c:5558
 msgid "unterminated escape sequence"
 msgstr "未終了のエスケープシーケンス"
 
-#: ../libnm-core/nm-utils.c:6289
+#: ../libnm-core/nm-utils.c:5583
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "不明な属性 '%s'"
 
-#: ../libnm-core/nm-utils.c:6304
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:5598
+#, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
 
-#: ../libnm-core/nm-utils.c:6320
+#: ../libnm-core/nm-utils.c:5614
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効な uint32 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6329
+#: ../libnm-core/nm-utils.c:5623
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効な uint8 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6339
+#: ../libnm-core/nm-utils.c:5633
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "属性 '%s' の無効なブール値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6349
+#: ../libnm-core/nm-utils.c:5643
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "タイプ '%s' のサポートされていない属性 '%s'"
 
+#: ../libnm-core/nm-utils.c:5992
+#, c-format
+msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
+msgstr "ブリッジ VLANs %d および %d は、上昇する vid でソートされません"
+
+#: ../libnm-core/nm-utils.c:6016
+#, c-format
+msgid "duplicate bridge VLAN vid %u"
+msgstr "ブリッジ VLAN vid %u を複製します"
+
+#: ../libnm-core/nm-utils.c:6028
+msgid "only one VLAN can be the PVID"
+msgstr "PVID になれるのは 1 つの VLAN のみです"
+
 #: ../libnm-core/nm-vpn-editor-plugin.c:296
 #, c-format
 msgid "cannot load plugin \"%s\": %s"
@@ -12516,361 +12783,172 @@ msgstr "プラグインはインポート機能をサポートしません"
 msgid "the plugin does not support export capability"
 msgstr "プラグインはエクスポート機能をサポートしません"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:108
 #, c-format
 msgid "missing filename"
 msgstr "不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:116
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "ファイル名は絶対パスである必要があります (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:125
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "ファイル名の形式が無効です (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:448
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "競合するプラグイン (%s) が存在します (同じ %s.%s 値を持ちます)。"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:486
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "同じ名前 (%s) の競合するプラグインが存在します"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1070
+#: ../libnm-core/nm-vpn-plugin-info.c:1068
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "不明な \"plugin\" 設定"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1080
+#: ../libnm-core/nm-vpn-plugin-info.c:1078
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1154
 msgid "missing filename to load VPN plugin info"
 msgstr "VPN プラグイン情報をロードする不明なファイル名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1186
+#: ../libnm-core/nm-vpn-plugin-info.c:1166
 msgid "missing name for VPN plugin info"
 msgstr "VPN プラグイン情報の不明な名前"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1195
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報の不明なサービス"
 
-#: ../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:1386
-msgid "OLPC Mesh"
-msgstr "OLPC メッシュ"
-
-#: ../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:1408
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../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:1412
-msgid "VXLAN"
-msgstr "VXLAN"
-
-#: ../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:1416
-msgid "Tun"
-msgstr "Tun"
-
-#: ../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:1462
-msgid "Wired"
-msgstr "有線"
-
-#: ../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:1495
-msgid "USB"
-msgstr "USB"
-
-#. TRANSLATORS: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
-#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
-
-#: ../libnm-glib/nm-remote-connection.c:148
-msgid "Disconnected by D-Bus"
-msgstr "D-Bus により切断"
-
-#: ../libnm-util/crypto.c:143
-#, c-format
-msgid "Doesn't look like a PEM private key file."
-msgstr "PEM プライベートキーファイルではないようです。"
-
-#: ../libnm-util/crypto.c:405 ../libnm-util/crypto_gnutls.c:151
-#: ../libnm-util/crypto_gnutls.c:253 ../libnm-util/crypto_nss.c:162
-#: ../libnm-util/crypto_nss.c:323
-#, c-format
-msgid "Private key cipher '%s' was unknown."
-msgstr "プライベートキー暗号文 '%s' は不明です。"
-
-#: ../libnm-util/crypto_gnutls.c:84
-#, c-format
-msgid "Hash length too long (%d > %d)."
-msgstr "ハッシュ長が長すぎます (%d > %d)。"
-
-#: ../libnm-util/crypto_gnutls.c:115
-#, c-format
-msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "MD5 エンジンの初期化に失敗しました: %s (%s)"
-
-#: ../libnm-util/crypto_gnutls.c:159
-#, c-format
-msgid "Invalid IV length (must be at least %zd)."
-msgstr "IV の長さが無効です (最低 %zd の長さが必要)。"
-
-#: ../libnm-util/crypto_nss.c:99
-#, c-format
-msgid "Failed to initialize the MD5 context: %d."
-msgstr "MD5 コンテキストの初期化に失敗しました: %d。"
-
-#: ../libnm-util/crypto_nss.c:170
-#, c-format
-msgid "Invalid IV length (must be at least %d)."
-msgstr "IV の長さが無効です (最低でも %d は必要)。"
-
-#: ../libnm-util/crypto_nss.c:457
-#, c-format
-msgid "Couldn't convert password to UCS2: %d"
-msgstr "パスワードを UCS2 に変換できません: %d"
-
-#: ../libnm-util/nm-setting-8021x.c:1811
-msgid "invalid private key"
-msgstr "無効なプライベートキー"
-
-#: ../libnm-util/nm-setting-8021x.c:2122
-msgid "invalid phase2 private key"
-msgstr "無効な phase2 プライベートキー"
-
-#: ../libnm-util/nm-setting-bluetooth.c:185
-#, c-format
-msgid "requires '%s' or '%s' setting"
-msgstr "'%s' または '%s' の設定が必要です"
-
-#: ../libnm-util/nm-setting-bond.c:581
-#, c-format
-msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "'%s' は、'%s' オプションの有効なインターフェース名ではありません"
-
-#: ../libnm-util/nm-setting-connection.c:831
-#: ../libnm-util/nm-setting-infiniband.c:269
-#, c-format
-msgid "'%s' is not a valid interface name"
-msgstr "'%s' は有効なインターフェース名ではありません"
-
-#: ../libnm-util/nm-setting-connection.c:859
-#, c-format
-msgid "requires presence of '%s' setting in the connection"
-msgstr "接続には '%s' 設定が必要です"
-
-#: ../libnm-util/nm-setting-infiniband.c:231
-msgid "not a valid interface name"
-msgstr "無効なインターフェース名です"
-
-#: ../libnm-util/nm-setting-ip4-config.c:957
-#, c-format
-msgid "%d. IPv4 address is invalid"
-msgstr "%d. IPv4 アドレスは無効です"
-
-#: ../libnm-util/nm-setting-ip4-config.c:967
-#, c-format
-msgid "%d. IPv4 address has invalid prefix"
-msgstr "%d. IPv4 に無効なプレフィックスがあります"
-
-#: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
-#, c-format
-msgid "%d. route has invalid prefix"
-msgstr "%d. ルートに無効なプレフィックスがあります"
-
-#: ../libnm-util/nm-setting-ip6-config.c:911
-#, c-format
-msgid "%d. IPv6 address is invalid"
-msgstr "%d. IPv6 アドレスは無効です"
-
-#: ../libnm-util/nm-setting-ip6-config.c:921
-#, c-format
-msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
-
-#: ../libnm-util/nm-setting-vpn.c:581
-#, c-format
-msgid "Failed to convert '%s' value '%s' to uint"
-msgstr "'%s' 値 '%s' を uint に変換するのに失敗しました"
-
-#: ../libnm-util/nm-setting-vpn.c:588
-#, c-format
-msgid "Secret flags property '%s' not found"
-msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-
-#: ../libnm-util/nm-setting-wireless.c:806
-#, c-format
-msgid "requires setting '%s' property"
-msgstr "'%s' プロパティーの設定が必要です"
-
-#: ../libnm/nm-device-adsl.c:72
+#: ../libnm/nm-device-adsl.c:69
 msgid "The connection was not an ADSL connection."
 msgstr "接続は、ADSL 接続ではありませんでした。"
 
-#: ../libnm/nm-device-bond.c:111
+#: ../libnm/nm-device-bond.c:109
 msgid "The connection was not a bond connection."
 msgstr "接続は、ボンド接続ではありませんでした。"
 
-#: ../libnm/nm-device-bridge.c:115
+#: ../libnm/nm-device-bridge.c:113
 msgid "The connection was not a bridge connection."
 msgstr "接続は、ブリッジ接続ではありませんでした。"
 
-#: ../libnm/nm-device-bt.c:137
+#: ../libnm/nm-device-bt.c:135
 #, c-format
 msgid "The connection was not a Bluetooth connection."
 msgstr "接続は、Bluetooth 接続ではありませんでした。"
 
-#: ../libnm/nm-device-bt.c:143
+#: ../libnm/nm-device-bt.c:141
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
 msgstr "接続は、Bluetooth NAP タイプです。"
 
-#: ../libnm/nm-device-bt.c:152
+#: ../libnm/nm-device-bt.c:150
 msgid "Invalid device Bluetooth address."
 msgstr "無効なデバイス Bluetooth アドレスです。"
 
-#: ../libnm/nm-device-bt.c:158
+#: ../libnm/nm-device-bt.c:156
 msgid "The Bluetooth addresses of the device and the connection didn't match."
 msgstr "デバイスと接続の Bluetooth アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-bt.c:167
+#: ../libnm/nm-device-bt.c:165
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "デバイスには、接続に必要な Bluetooth 機能がありません。"
 
-#: ../libnm/nm-device-dummy.c:76
+#: ../libnm/nm-device-dummy.c:75
 msgid "The connection was not a dummy connection."
 msgstr "接続は、ダミー接続ではありませんでした。"
 
-#: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-dummy.c:82 ../libnm/nm-device-generic.c:96
+#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
 #: ../libnm/nm-device-ovs-port.c:96
 msgid "The connection did not specify an interface name."
 msgstr "接続で、インターフェース名が指定されませんでした。"
 
-#: ../libnm/nm-device-ethernet.c:206
+#: ../libnm/nm-device-ethernet.c:204
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "接続は、Ethernet または PPPoE 接続ではありませんでした。"
 
-#: ../libnm/nm-device-ethernet.c:221
+#: ../libnm/nm-device-ethernet.c:219
 msgid "The connection and device differ in S390 subchannels."
 msgstr "接続とデバイスは、S390 サブチャネルで異なります。"
 
-#: ../libnm/nm-device-ethernet.c:236
+#: ../libnm/nm-device-ethernet.c:234
 #, c-format
 msgid "Invalid device MAC address %s."
 msgstr "無効なデバイス MAC アドレス %s。"
 
-#: ../libnm/nm-device-ethernet.c:241
+#: ../libnm/nm-device-ethernet.c:239
 msgid "The MACs of the device and the connection do not match."
 msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-ethernet.c:251
+#: ../libnm/nm-device-ethernet.c:249
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
 msgstr "ブラックリストの無効な MAC: %s。"
 
-#: ../libnm/nm-device-ethernet.c:257
+#: ../libnm/nm-device-ethernet.c:255
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "デバイス MAC (%s) は、接続によりブラックリスト化されています。"
 
-#: ../libnm/nm-device-generic.c:90
+#: ../libnm/nm-device-generic.c:89
 msgid "The connection was not a generic connection."
 msgstr "接続は汎用的な接続ではありませんでした。"
 
-#: ../libnm/nm-device-tun.c:208
-msgid "The connection was not a tun connection."
-msgstr "接続は tun 接続ではありませんでした。"
-
-#: ../libnm/nm-device-tun.c:217
-msgid "The mode of the device and the connection didn't match"
-msgstr "デバイスと接続のモードが一致しませんでした"
-
-#: ../libnm/nm-device-infiniband.c:93
+#: ../libnm/nm-device-infiniband.c:91
 msgid "The connection was not an InfiniBand connection."
 msgstr "接続は InfiniBand 接続ではありませんでした。"
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
-#: ../libnm/nm-device-wimax.c:324
+#: ../libnm/nm-device-infiniband.c:99 ../libnm/nm-device-wifi.c:622
+#: ../libnm/nm-device-wimax.c:322
 msgid "Invalid device MAC address."
 msgstr "無効なデバイス MAC アドレスです。"
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
-#: ../libnm/nm-device-wimax.c:331
+#: ../libnm/nm-device-infiniband.c:107 ../libnm/nm-device-wifi.c:629
+#: ../libnm/nm-device-wimax.c:329
 msgid "The MACs of the device and the connection didn't match."
 msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-ip-tunnel.c:271
+#: ../libnm/nm-device-ip-tunnel.c:269
 msgid "The connection was not an IP tunnel connection."
 msgstr "接続は IP トンネル接続ではありませんでした。"
 
-#: ../libnm/nm-device-macvlan.c:157
+#: ../libnm/nm-device-macvlan.c:155
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "接続は MAC-VLAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:119
+#: ../libnm/nm-device-modem.c:117
 msgid "The connection was not a modem connection."
 msgstr "接続はモデム接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:127
+#: ../libnm/nm-device-modem.c:125
 msgid "The connection was not a valid modem connection."
 msgstr "接続は有効なモデム接続ではありませんでした。"
 
-#: ../libnm/nm-device-modem.c:134
+#: ../libnm/nm-device-modem.c:132
 msgid "The device is lacking capabilities required by the connection."
 msgstr "デバイスには接続に必要な機能がありません。"
 
-#: ../libnm/nm-device-olpc-mesh.c:114
+#: ../libnm/nm-device-olpc-mesh.c:112
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "接続は OLPC メッシュ接続ではありませんでした。"
 
-#: ../libnm/nm-device-ovs-bridge.c:90
+#: ../libnm/nm-device-ovs-bridge.c:89
 msgid "The connection was not a ovs_bridge connection."
 msgstr "接続は、ovs_bridge 接続ではありませんでした。"
 
-#: ../libnm/nm-device-ovs-interface.c:61
+#: ../libnm/nm-device-ovs-interface.c:60
 msgid "The connection was not a ovs_interface connection."
 msgstr "接続は、ovs_interface 接続ではありませんでした。"
 
@@ -12878,50 +12956,70 @@ msgstr "接続は、ovs_interface 接続ではありませんでした。"
 msgid "The connection was not a ovs_port connection."
 msgstr "接続は、ovs_port 接続ではありませんでした。"
 
-#: ../libnm/nm-device-team.c:138
+#: ../libnm/nm-device-team.c:136
 msgid "The connection was not a team connection."
 msgstr "接続は team 接続ではありませんでした。"
 
-#: ../libnm/nm-device-vlan.c:128
+#: ../libnm/nm-device-tun.c:207
+msgid "The connection was not a tun connection."
+msgstr "接続は tun 接続ではありませんでした。"
+
+#: ../libnm/nm-device-tun.c:216
+msgid "The mode of the device and the connection didn't match"
+msgstr "デバイスと接続のモードが一致しませんでした"
+
+#: ../libnm/nm-device-vlan.c:126
 msgid "The connection was not a VLAN connection."
 msgstr "接続は VLAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device-vlan.c:135
+#: ../libnm/nm-device-vlan.c:133
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "デバイスと接続の VLAN ID が一致しませんでした。"
 
-#: ../libnm/nm-device-vlan.c:150
+#: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "デバイスと接続のハードウェアアドレスが一致しませんでした。"
 
-#: ../libnm/nm-device-vxlan.c:386
+#: ../libnm/nm-device-vxlan.c:384
 msgid "The connection was not a VXLAN connection."
 msgstr "接続は VXLAN 接続ではありませんでした。"
 
-#: ../libnm/nm-device-vxlan.c:393
+#: ../libnm/nm-device-vxlan.c:391
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
 
-#: ../libnm/nm-device-wifi.c:616
+#: ../libnm/nm-device-wifi-p2p.c:326
+msgid "The connection was not a Wi-Fi P2P connection."
+msgstr "接続は Wi-Fi P2P 接続ではありませんでした。"
+
+#: ../libnm/nm-device-wifi.c:613
 msgid "The connection was not a Wi-Fi connection."
 msgstr "接続は Wi-Fi 接続ではありませんでした。"
 
-#: ../libnm/nm-device-wifi.c:652
+#: ../libnm/nm-device-wifi.c:649
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "デバイスには接続に必要な WPA 機能がありません。"
 
-#: ../libnm/nm-device-wifi.c:659
+#: ../libnm/nm-device-wifi.c:656
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
 
-#: ../libnm/nm-device-wimax.c:315
+#: ../libnm/nm-device-wimax.c:313
 msgid "The connection was not a WiMAX connection."
 msgstr "接続は WiMAX 接続ではありませんでした。"
 
-#: ../libnm/nm-device-wpan.c:82
+#: ../libnm/nm-device-wpan.c:81
 msgid "The connection was not a wpan connection."
 msgstr "接続は WPAN 接続ではありませんでした。"
 
+#: ../libnm/nm-device.c:1384
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../libnm/nm-device.c:1386
+msgid "OLPC Mesh"
+msgstr "OLPC メッシュ"
+
 #: ../libnm/nm-device.c:1388
 msgid "Open vSwitch Interface"
 msgstr "Open vSwitch インターフェース"
@@ -12934,6 +13032,34 @@ msgstr "Open vSwitch ポート"
 msgid "Open vSwitch Bridge"
 msgstr "Open vSwitch ブリッジ"
 
+#: ../libnm/nm-device.c:1394
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../libnm/nm-device.c:1408
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../libnm/nm-device.c:1410
+msgid "MACVLAN"
+msgstr "MACVLAN"
+
+#: ../libnm/nm-device.c:1412
+msgid "VXLAN"
+msgstr "VXLAN"
+
+#: ../libnm/nm-device.c:1414
+msgid "IPTunnel"
+msgstr "IPTunnel"
+
+#: ../libnm/nm-device.c:1416
+msgid "Tun"
+msgstr "Tun"
+
+#: ../libnm/nm-device.c:1418
+msgid "Veth"
+msgstr "Veth"
+
 #: ../libnm/nm-device.c:1420
 msgid "MACsec"
 msgstr "MACsec"
@@ -12958,29 +13084,57 @@ msgstr "6LoWPAN"
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:2549
+#: ../libnm/nm-device.c:1432
+msgid "Wi-Fi P2P"
+msgstr "Wi-Fi P2P"
+
+#: ../libnm/nm-device.c:1464
+msgid "Wired"
+msgstr "有線"
+
+#: ../libnm/nm-device.c:1495
+msgid "PCI"
+msgstr "PCI"
+
+#: ../libnm/nm-device.c:1497
+msgid "USB"
+msgstr "USB"
+
+#. TRANSLATORS: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../libnm/nm-device.c:1810 ../libnm/nm-device.c:1829
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../libnm/nm-device.c:2551
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続は有効ではありませんでした: %s"
 
-#: ../libnm/nm-device.c:2558
+#: ../libnm/nm-device.c:2560
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
 
-#: ../libnm/nm-manager.c:274
+#: ../libnm/nm-manager.c:272
 msgid "Checkpoint was removed before it was initialized"
 msgstr "チェックポイントが初期化前に削除されました"
 
-#: ../libnm/nm-manager.c:953
+#: ../libnm/nm-manager.c:993
 msgid "Active connection removed before it was initialized"
 msgstr "アクティブな接続が初期化前に削除されました"
 
-#: ../libnm/nm-remote-settings.c:256
+#: ../libnm/nm-remote-settings.c:253
 msgid "Connection removed before it was initialized"
 msgstr "接続が初期化前に削除されました"
 
-#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1051
+#: ../libnm/nm-vpn-plugin-old.c:846 ../libnm/nm-vpn-service-plugin.c:1045
 msgid "No service name specified"
 msgstr "サービス名が指定されていません"
 
@@ -13055,99 +13209,107 @@ msgid "System policy prevents control of network connections"
 msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Allow control of Wi-Fi scans"
+msgstr "Wi-Fi スキャンの制御を許可"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents Wi-Fi scans"
+msgstr "システムポリシーにより Wi-Fi スキャンは阻止されます"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Connection sharing via a protected Wi-Fi network"
 msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid ""
 "System policy prevents sharing connections via a protected Wi-Fi network"
 msgstr ""
 "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
 "ます。"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Connection sharing via an open Wi-Fi network"
 msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents sharing connections via an open Wi-Fi network"
 msgstr ""
 "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
 "止されます。"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify personal network connections"
 msgstr "個人のネットワーク接続を編集"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of personal network settings"
 msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify network connections for all users"
 msgstr "全ユーザーのネットワーク接続を編集"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of network settings for all users"
 msgstr "システムポリシーにより、全ユーザーでネットワーク設定を編集できません"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent system hostname"
 msgstr "永続的なシステムのホスト名を修正"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "システムポリシーにより、永続的なシステムのホスト名が修正できません"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
 msgid "Modify persistent global DNS configuration"
 msgstr "永続的なグローバル DNS 設定の変更"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr "システムポリシーにより、永続的なグローバル DNS 設定を変更できません"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
 msgid "Perform a checkpoint or rollback of interfaces configuration"
 msgstr "インターフェース設定のチェックポイントまたはロールバックを実行"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
 msgid "System policy prevents the creation of a checkpoint or its rollback"
 msgstr ""
 "システムポリシーによりチェックポイントまたはそのロールバックの作成が回避され"
 "ます"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
 msgid "Enable or disable device statistics"
 msgstr "デバイスの統計値を有効または無効にする"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
 msgid "System policy prevents enabling or disabling device statistics"
 msgstr "システムポリシーにより、デバイス統計値を有効化または無効化できません"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:33
 msgid "Enable or disable connectivity checking"
 msgstr "接続確認を有効または無効にする"
 
-#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:34
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "システムポリシーにより、接続確認を有効化または無効化できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1130
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1481
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1137
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1488
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1144
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1495
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -13155,19 +13317,19 @@ msgstr ""
 "コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
 "ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:1152
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1503
 #, 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:1161
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1512
 #, 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:1172
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1523
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -13176,53 +13338,98 @@ msgstr ""
 "値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効また"
 "は範囲外です"
 
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
+#, fuzzy, c-format
+msgid "'%s' is not valid: properties should be specified as 'key=value'"
+msgstr "'%s' は無効です。2  文字または 3 文字の文字列を入力してください"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:251
+#, fuzzy, c-format
+msgid "'%s' is not a valid key"
+msgstr "'%s' は有効ではありません。"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:257
+#, fuzzy, c-format
+msgid "duplicate key '%s'"
+msgstr "VF インデックス %u を複製します"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:271
+#, fuzzy, c-format
+msgid "number for '%s' is out of range"
+msgstr "'%s' は、[0, %u] の範囲外です"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:274
+#, fuzzy, c-format
+msgid "value for '%s' must be a number"
+msgstr "'%s' は数字ではありません"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:285
+#, c-format
+msgid "value for '%s' must be a boolean"
+msgstr ""
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:294
+#, fuzzy
+msgid "missing 'name' attribute"
+msgstr "不明な設定"
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:301
+#, fuzzy, c-format
+msgid "invalid 'name' \"%s\""
+msgstr "無効なランナー \"%s\""
+
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:313
+#, fuzzy, c-format
+msgid "attribute '%s' is invalid for \"%s\""
+msgstr "属性は IPv4 ルートには無効です"
+
 #. TRANSLATORS: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:120
+#: ../src/NetworkManagerUtils.c:122
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %u"
 msgstr "%s %u"
 
-#: ../src/main.c:180 ../src/main.c:315
+#: ../src/main.c:177 ../src/main.c:342
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定の読み込みに失敗しました: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:191 ../src/nm-iface-helper.c:293
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:195 ../src/nm-iface-helper.c:298
+#: ../src/main.c:192 ../src/nm-iface-helper.c:294
 msgid "Don't become a daemon"
 msgstr "デーモンにしない"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:300
+#: ../src/main.c:193 ../src/nm-iface-helper.c:296
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] のいずれか"
 
-#: ../src/main.c:198 ../src/nm-iface-helper.c:302
+#: ../src/main.c:195 ../src/nm-iface-helper.c:298
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "',' で区切ったログドメイン: [%s] の組み合わせ"
 
-#: ../src/main.c:200 ../src/nm-iface-helper.c:304
+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
 msgid "Make all warnings fatal"
 msgstr "すべての警告を致命的にする"
 
-#: ../src/main.c:201
+#: ../src/main.c:198
 msgid "Specify the location of a PID file"
 msgstr "PID ファイルの場所を指定する"
 
-#: ../src/main.c:203
+#: ../src/main.c:200
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager の設定を表示して終了する"
 
-#: ../src/main.c:213
+#: ../src/main.c:210
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -13234,51 +13441,51 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441
+#: ../src/main.c:332 ../src/main-utils.c:290 ../src/nm-iface-helper.c:439
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:340 ../src/nm-iface-helper.c:456
+#: ../src/main.c:365 ../src/nm-iface-helper.c:452
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
 
-#: ../src/main-utils.c:99
+#: ../src/main-utils.c:100
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s のオープンに失敗しました: %s\n"
 
-#: ../src/main-utils.c:105
+#: ../src/main-utils.c:107
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s への書き込みに失敗しました: %s\n"
 
-#: ../src/main-utils.c:110
+#: ../src/main-utils.c:113
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/main-utils.c:148 ../src/main-utils.c:159
+#: ../src/main-utils.c:152 ../src/main-utils.c:163
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "'%s' を作成できません: %s"
 
-#: ../src/main-utils.c:212
+#: ../src/main-utils.c:216
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s はすでに実行中です (pid %ld)\n"
 
-#: ../src/main-utils.c:222
+#: ../src/main-utils.c:226
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "%s を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -13287,7 +13494,7 @@ msgstr ""
 "# %s からマージされています\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:212
+#: ../src/devices/bluetooth/nm-bluez-device.c:210
 #, c-format
 msgid "%s Network"
 msgstr "%s ネットワーク"
@@ -13313,12 +13520,12 @@ msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 接続には、GSM または CDMA 設定が含まれる必要があります"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:322
-#: ../src/devices/wwan/nm-modem-broadband.c:696
+#: ../src/devices/wwan/nm-modem-broadband.c:702
 msgid "GSM connection"
 msgstr "GSM 接続"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:324
-#: ../src/devices/wwan/nm-modem-broadband.c:720
+#: ../src/devices/wwan/nm-modem-broadband.c:726
 msgid "CDMA connection"
 msgstr "CDMA 接続"
 
@@ -13329,7 +13536,7 @@ msgstr "不明な/未処理の Bluetooth 接続タイプ"
 #: ../src/devices/bluetooth/nm-device-bt.c:353
 #: ../src/devices/nm-device-ethernet.c:1432
 #: ../src/devices/nm-device-infiniband.c:190
-#: ../src/devices/wifi/nm-device-wifi.c:908
+#: ../src/devices/wifi/nm-device-wifi.c:925
 msgid "connection does not match device"
 msgstr "接続がデバイスに一致しません"
 
@@ -13337,15 +13544,15 @@ msgstr "接続がデバイスに一致しません"
 msgid "6LOWPAN connection"
 msgstr "6LOWPAN 接続"
 
-#: ../src/devices/nm-device-bond.c:72
+#: ../src/devices/nm-device-bond.c:71
 msgid "Bond connection"
 msgstr "ボンド接続"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:154
 msgid "Bridge connection"
 msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-dummy.c:68
+#: ../src/devices/nm-device-dummy.c:67
 msgid "Dummy connection"
 msgstr "ダミー接続"
 
@@ -13362,19 +13569,19 @@ msgstr "有線接続"
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:419
+#: ../src/devices/nm-device-ip-tunnel.c:422
 msgid "IP tunnel connection"
 msgstr "IP トンネル接続"
 
-#: ../src/devices/nm-device-macvlan.c:366
+#: ../src/devices/nm-device-macvlan.c:365
 msgid "MACVLAN connection"
 msgstr "MACVLAN 接続"
 
-#: ../src/devices/nm-device-tun.c:158
+#: ../src/devices/nm-device-tun.c:157
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/nm-device-wpan.c:69
+#: ../src/devices/nm-device-wpan.c:68
 msgid "WPAN connection"
 msgstr "WPAN 接続"
 
@@ -13382,317 +13589,311 @@ msgstr "WPAN 接続"
 msgid "Team connection"
 msgstr "team 接続"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:136
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:134
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../src/devices/wifi/nm-device-wifi.c:881
+#: ../src/devices/wifi/nm-device-wifi.c:898
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "WPA アドホックはカーネルバグのため無効になりました"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:43
+#: ../src/devices/wifi/nm-wifi-utils.c:42
 #, c-format
 msgid "%s is incompatible with static WEP keys"
 msgstr "%s は静的 WEP キーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:77
+#: ../src/devices/wifi/nm-wifi-utils.c:76
 msgid "LEAP authentication requires a LEAP username"
 msgstr "LEAP 認証には LEAP ユーザー名が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:87
+#: ../src/devices/wifi/nm-wifi-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
 msgstr "LEAP ユーザー名には 'leap' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:100
+#: ../src/devices/wifi/nm-wifi-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr "LEAP 認証には IEEE 802.1x キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:120
+#: ../src/devices/wifi/nm-wifi-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr "LEAP 認証はアドホックモードと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:132
+#: ../src/devices/wifi/nm-wifi-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
 msgstr "LEAP 認証は 802.1x 設定と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:154
+#: ../src/devices/wifi/nm-wifi-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr "'%s' 認証を使用している接続は WPA キー管理を使用できません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:165
+#: ../src/devices/wifi/nm-wifi-utils.c:164
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr "'%s' 認証を使用している接続は WPA プロトコルを指定できません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:181
-#: ../src/devices/wifi/nm-wifi-utils.c:198
+#: ../src/devices/wifi/nm-wifi-utils.c:180
+#: ../src/devices/wifi/nm-wifi-utils.c:197
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr "'%s' 認証を使用している接続は WPA 暗号を指定できません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:210
+#: ../src/devices/wifi/nm-wifi-utils.c:209
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr "'%s' 認証を使用している接続は WPA パスワードを指定できません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:241
+#: ../src/devices/wifi/nm-wifi-utils.c:240
 msgid "Dynamic WEP requires an 802.1x setting"
 msgstr "動的 WEP には 802.1x 設定が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:251
-#: ../src/devices/wifi/nm-wifi-utils.c:279
+#: ../src/devices/wifi/nm-wifi-utils.c:250
+#: ../src/devices/wifi/nm-wifi-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
 msgstr "動的 WEP には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:266
+#: ../src/devices/wifi/nm-wifi-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
 msgstr "動的 WEP には 'ieee8021x' キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:313
+#: ../src/devices/wifi/nm-wifi-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
 msgstr "WPA-PSK 認証は 802.1x と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:323
+#: ../src/devices/wifi/nm-wifi-utils.c:322
 msgid "WPA-PSK requires 'open' authentication"
 msgstr "WPA-PSK には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:335
+#: ../src/devices/wifi/nm-wifi-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
 msgstr "WPA アドホック認証にはアドホックモード AP が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:348
+#: ../src/devices/wifi/nm-wifi-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
 msgstr "WPA アドホック認証には 'wpa' プロトコルが必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:360
+#: ../src/devices/wifi/nm-wifi-utils.c:359
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
 msgstr "WPA アドホック認証には 'none' ペア暗号が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:372
+#: ../src/devices/wifi/nm-wifi-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
 msgstr "WPA アドホック認証には 'tkip' グループ暗号が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:386
+#: ../src/devices/wifi/nm-wifi-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
 msgstr "アクセスポイントは PSK をサポートしませんが、設定では PSK が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:416
+#: ../src/devices/wifi/nm-wifi-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
 msgstr "WPA-EAP 認証には 802.1x 設定が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:426
+#: ../src/devices/wifi/nm-wifi-utils.c:425
 msgid "WPA-EAP requires 'open' authentication"
 msgstr "WPA-EAP には 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:437
+#: ../src/devices/wifi/nm-wifi-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
 msgstr "802.1x 設定には 'wpa-eap' キー管理が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:450
+#: ../src/devices/wifi/nm-wifi-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
 msgstr ""
 "アクセスポイントは 802.1x をサポートしませんが、設定では 802.1x 必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:478
+#: ../src/devices/wifi/nm-wifi-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
 msgstr ""
 "アクセスポイントモードはアドホックですが、設定ではインフラストラクチャーセ"
 "キュリティーが必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:488
+#: ../src/devices/wifi/nm-wifi-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
 msgstr "アドホックモードは 802.1x セキュリティーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:497
+#: ../src/devices/wifi/nm-wifi-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
 msgstr "アドホックモードは LEAP セキュリティーと互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:507
+#: ../src/devices/wifi/nm-wifi-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
 msgstr "アドホックモードには 'open' 認証が必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:517
+#: ../src/devices/wifi/nm-wifi-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
 msgstr ""
 "アクセスポイントモードはインフラストラクチャーですが、設定ではアドホックセ"
 "キュリティーが必要です"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:558
-#: ../src/devices/wifi/nm-wifi-utils.c:586
+#: ../src/devices/wifi/nm-wifi-utils.c:557
+#: ../src/devices/wifi/nm-wifi-utils.c:585
 #, c-format
 msgid "connection does not match access point"
 msgstr "接続がアクセスポイントに一致しません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:610
+#: ../src/devices/wifi/nm-wifi-utils.c:609
 msgid "Access point is unencrypted but setting specifies security"
 msgstr ""
 "アクセスポイントは暗号化されていませんが、設定ではセキュリティーが指定されて"
 "います"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:699
+#: ../src/devices/wifi/nm-wifi-utils.c:698
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr ""
 "WPA 認証は、非 EAP (オリジナル) LEAP または動的 WEP と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:709
+#: ../src/devices/wifi/nm-wifi-utils.c:708
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr "WPA 認証は、共有キー認証と互換性がありません"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:756
+#: ../src/devices/wifi/nm-wifi-utils.c:761
 msgid "Failed to determine AP security information"
 msgstr "AP セキュリティー情報の決定に失敗しました。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:686
-msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
-
-#: ../src/nm-config.c:563
-#, fuzzy, c-format
+#: ../src/nm-config.c:562
+#, c-format
 msgid "Bad '%s' option: "
-msgstr "'%s' オプションが空白です"
+msgstr "不正な '%s' オプション: "
 
-#: ../src/nm-config.c:576
+#: ../src/nm-config.c:575
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:577
+#: ../src/nm-config.c:576
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:578
+#: ../src/nm-config.c:577
 msgid "System config directory location"
 msgstr "システム設定ディレクトリーの場所"
 
-#: ../src/nm-config.c:579
+#: ../src/nm-config.c:578
 msgid "Internal config file location"
 msgstr "内部設定ファイルの場所"
 
-#: ../src/nm-config.c:580
+#: ../src/nm-config.c:579
 msgid "State file location"
 msgstr "状態ファイルの場所"
 
-#: ../src/nm-config.c:581
+#: ../src/nm-config.c:580
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デバイスの状態ファイル"
 
-#: ../src/nm-config.c:582
+#: ../src/nm-config.c:581
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを ',' で区切った一覧"
 
-#: ../src/nm-config.c:583
+#: ../src/nm-config.c:582
 msgid "Quit after initial configuration"
 msgstr "初期設定後に終了する"
 
-#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:583 ../src/nm-iface-helper.c:295
 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:587
+#: ../src/nm-config.c:586
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:588
+#: ../src/nm-config.c:587
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:589
+#: ../src/nm-config.c:588
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
-#: ../src/nm-config.c:596
-#, fuzzy
+#: ../src/nm-config.c:595
 msgid "NetworkManager options"
-msgstr "NetworkManager のパーミッション"
+msgstr "NetworkManager オプション"
 
-#: ../src/nm-config.c:596
-#, fuzzy
+#: ../src/nm-config.c:595
 msgid "Show NetworkManager options"
-msgstr "NetworkManager のパーミッション"
+msgstr "NetworkManager オプションを表示"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:275
 msgid "The interface to manage"
 msgstr "管理するインターフェース"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:276
 msgid "Connection UUID"
 msgstr "接続 UUID"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:277
 msgid "Connection Token for Stable IDs"
 msgstr "安定 ID の接続トークン"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:278
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "IPv6 SLAAC を管理するかどうか"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:279
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:280
 msgid "Use an IPv6 temporary privacy address"
 msgstr "IPv6 一時プライバシーアドレスの使用"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:281
 msgid "Current DHCPv4 address"
 msgstr "現在の DHCPv4 アドレス"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:282
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 が成功する必要があるかどうか"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:283
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "16 進エンコードされた DHCPv4 クライアント ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:284
 msgid "Hostname to send to DHCP server"
 msgstr "DHCP サーバーに送信するホスト名"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:284
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:285
 msgid "FQDN to send to DHCP server"
 msgstr "DHCP サーバーに送信する FQDN"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:285
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:286
 msgid "Route priority for IPv4"
 msgstr "IPv4 のルート優先度"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:286
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:287
 msgid "Route priority for IPv6"
 msgstr "IPv6 のルート優先度"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:287
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded Interface Identifier"
 msgstr "16 進エンコードされたインターフェース ID"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:289
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC アドレス生成モード"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:290
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -13700,7 +13901,7 @@ msgstr ""
 "ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照して"
 "ください"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:310
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -13708,41 +13909,265 @@ msgstr ""
 "nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
 "ドアロンプロセスです。"
 
-#: ../src/nm-iface-helper.c:422
+#: ../src/nm-iface-helper.c:419
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "インターフェース名と UUID が’必要です\n"
 
-#: ../src/nm-iface-helper.c:428
+#: ../src/nm-iface-helper.c:426
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
 
-#: ../src/nm-iface-helper.c:446
+#: ../src/nm-iface-helper.c:444
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/nm-iface-helper.c:485
+#: ../src/nm-iface-helper.c:481
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効な IID %s\n"
 
-#: ../src/nm-iface-helper.c:496
+#: ../src/nm-iface-helper.c:492
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): 無効な DHCP client-id %s\n"
 
-#: ../src/nm-logging.c:275
+#: ../src/nm-logging.c:299
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:377
+#: ../src/nm-logging.c:409
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
+#~ msgid "Error: failed to remove a value from %s.%s: %s."
+#~ msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
+
+#~ msgid "WEP"
+#~ msgstr "WEP"
+
+#~ msgid "WPA1"
+#~ msgstr "WPA1"
+
+#~ msgid "WPA2"
+#~ msgstr "WPA2"
+
+#~ msgid "802.1X"
+#~ msgstr "802.1X"
+
+#~ msgid "default route cannot be added (NetworkManager handles it by itself)"
+#~ msgstr ""
+#~ "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
+
+#~ msgid "priority '%s' is not valid (<0-%ld>)"
+#~ msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
+
+#~ msgid "'%s' does not contain a valid team configuration"
+#~ msgstr "'%s' には有効なチーム設定が含まれていません"
+
+#~ msgid "team configuration must be a JSON object"
+#~ msgstr "チーム設定は JSON オブジェクトである必要があります"
+
+#~ msgid "no item to remove"
+#~ msgstr "削除するアイテムがありません"
+
+#~ msgid "index '%d' is not in range <0-%d>"
+#~ msgstr "インデックス '%d' は範囲内にありません <0-%d>"
+
+#~ msgid "missing option"
+#~ msgstr "足りないオプション"
+
+#~ msgid "'%s' is not a valid MAC"
+#~ msgstr "'%s' は有効な MAC ではありません"
+
+#~ msgid "the property doesn't contain EAP method '%s'"
+#~ msgstr "プロパティーには EAP メソッド '%s' が含まれません"
+
+#~ msgid "the property doesn't contain alternative subject match '%s'"
+#~ msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
+
+#~ msgid ""
+#~ "the property doesn't contain \"phase2\" alternative subject match '%s'"
+#~ msgstr ""
+#~ "プロパティーには代替の  \"phase2\" サブジェクトマッチ '%s' が含まれません"
+
+#~ msgid "the property doesn't contain permission '%s'"
+#~ msgstr "プロパティーにはパーミッション '%s' が含まれません"
+
+#~ msgid "the property doesn't contain UUID '%s'"
+#~ msgstr "プロパティーには UUID '%s' が含まれません"
+
+#~ msgid "the property doesn't contain DNS server '%s'"
+#~ msgstr "プロパティーには DNS サーバー '%s' が含まれません"
+
+#~ msgid "the property doesn't contain DNS search domain '%s'"
+#~ msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
+
+#~ msgid "the property doesn't contain DNS option '%s'"
+#~ msgstr "プロパティーには DNS オプション '%s' が含まれません"
+
+#~ msgid "the property doesn't contain IP address '%s'"
+#~ msgstr "プロパティーには IP アドレス '%s' が含まれません"
+
+#~ msgid "the property doesn't contain route '%s'"
+#~ msgstr "プロパティーにはルート '%s' が含まれません"
+
+#~ msgid "invalid IPv6 address '%s'"
+#~ msgstr "無効な IPv6 アドレス '%s'"
+
+#~ msgid "the property doesn't contain interface name '%s'"
+#~ msgstr "プロパティーにはインターフェース名 '%s' が含まれません"
+
+#~ msgid "the property doesn't contain vf with index %u"
+#~ msgstr "プロパティーにはインデックス %u を持つ vf が含まれません"
+
+#~ msgid "the property doesn't contain qdisc '%s'"
+#~ msgstr "プロパティーには qdisc '%s' が含まれません"
+
+#~ msgid ""
+#~ "The valid syntax is: '[root | parent <handle>] [handle <handle>] "
+#~ "<tfilter>'"
+#~ msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
+
+#~ msgid "the property doesn't contain tfilter '%s'"
+#~ msgstr "プロパティーには tfilter '%s' が含まれません"
+
+#~ msgid "the property doesn't contain string '%s'"
+#~ msgstr "プロパティーには文字列 '%s' が含まれません"
+
+#~ msgid "the property doesn't contain link watcher '%s'"
+#~ msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
+
+#~ msgid "only one mapping at a time is supported; taking the first one (%s)"
+#~ msgstr ""
+#~ "マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
+
+#~ msgid "the property doesn't contain mapping '%s'"
+#~ msgstr "プロパティーにはマッピング '%s' が含まれません"
+
+#~ msgid "no priority to remove"
+#~ msgstr "削除する優先度がありません"
+
+#~ msgid "index '%d' is not in the range of <0-%d>"
+#~ msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
+
+#~ msgid "'%s' cannot be empty"
+#~ msgstr "'%s' を空白にすることはできません"
+
+#~ msgid "the property doesn't contain MAC address '%s'"
+#~ msgstr "プロパティーには MAC アドレス '%s' が含まれません"
+
+#~ msgid "'%s' string value should consist of 1 - 199 characters"
+#~ msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
+
+#~ msgid "the property doesn't contain protocol '%s'"
+#~ msgstr "プロパティーにはプロトコル '%s' が含まれません"
+
+#~ msgid "'%s' is not a valid PSK"
+#~ msgstr "'%s' は有効な PSK ではありません"
+
+#~ msgid ""
+#~ "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it "
+#~ "must contain only hexadecimal characters and is interpreted as a "
+#~ "hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII "
+#~ "characters (as specified in the 802.11i standard) and is interpreted as a "
+#~ "WPA passphrase, and is hashed to derive the actual WPA-PSK used when "
+#~ "connecting to the Wi-Fi network."
+#~ msgstr ""
+#~ "WPA ネットワークの共有前のキー。このキーを 64 文字の長さにする場合は、16 "
+#~ "進数の文字でなければならず、16 進数の WPA キーとして解釈されません。それ以"
+#~ "外では、キーは、(802.11i 仕様で指定されているように) 8 文字から 63 文字の "
+#~ "ASCII 文字にする必要があり、WPA パスフレーズとして解釈されます。接続が Wi-"
+#~ "Fi ネットワークに接続する際に使用される実際の WPA-PSK を取得するためにハッ"
+#~ "シュ化されます。"
+
+#~ msgid ""
+#~ "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin"
+#~ "\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random"
+#~ "\". When setting the runner, all the properties specific to the runner "
+#~ "will be reset to the default value; all the properties specific to other "
+#~ "runners will be set to an empty value (or if not possible to a default "
+#~ "value)."
+#~ msgstr ""
+#~ "teamd runner.name に相当します。可能な値: \"roundrobin\"、\"broadcast"
+#~ "\"、\"activebackup\"、\"loadbalance\"、\"lacp\"、\"random\"。ランナーを設"
+#~ "定する際、このランナー特有のすべてのプロパティーは、デフォルト値にリセット"
+#~ "されます。他のランナー特有のプロパティーはすべて、空の値に設定されます (ま"
+#~ "たは、デフォルト値に設定されない場合は空の値に設定されます)。"
+
+#~ msgid "Disconnected by D-Bus"
+#~ msgstr "D-Bus により切断"
+
+#~ msgid "Doesn't look like a PEM private key file."
+#~ msgstr "PEM プライベートキーファイルではないようです。"
+
+#~ msgid "Private key cipher '%s' was unknown."
+#~ msgstr "プライベートキー暗号文 '%s' は不明です。"
+
+#~ msgid "Hash length too long (%d > %d)."
+#~ msgstr "ハッシュ長が長すぎます (%d > %d)。"
+
+#~ msgid "Failed to initialize the MD5 engine: %s (%s)"
+#~ msgstr "MD5 エンジンの初期化に失敗しました: %s (%s)"
+
+#~ msgid "Invalid IV length (must be at least %zd)."
+#~ msgstr "IV の長さが無効です (最低 %zd の長さが必要)。"
+
+#~ msgid "Failed to initialize the MD5 context: %d."
+#~ msgstr "MD5 コンテキストの初期化に失敗しました: %d。"
+
+#~ msgid "Invalid IV length (must be at least %d)."
+#~ msgstr "IV の長さが無効です (最低でも %d は必要)。"
+
+#~ msgid "Couldn't convert password to UCS2: %d"
+#~ msgstr "パスワードを UCS2 に変換できません: %d"
+
+#~ msgid "invalid phase2 private key"
+#~ msgstr "無効な phase2 プライベートキー"
+
+#~ msgid "requires '%s' or '%s' setting"
+#~ msgstr "'%s' または '%s' の設定が必要です"
+
+#~ msgid "'%s' is not a valid interface name for '%s' option"
+#~ msgstr "'%s' は、'%s' オプションの有効なインターフェース名ではありません"
+
+#~ msgid "'%s' is not a valid interface name"
+#~ msgstr "'%s' は有効なインターフェース名ではありません"
+
+#~ msgid "requires presence of '%s' setting in the connection"
+#~ msgstr "接続には '%s' 設定が必要です"
+
+#~ msgid "%d. IPv4 address is invalid"
+#~ msgstr "%d. IPv4 アドレスは無効です"
+
+#~ msgid "%d. IPv4 address has invalid prefix"
+#~ msgstr "%d. IPv4 に無効なプレフィックスがあります"
+
+#~ msgid "%d. route has invalid prefix"
+#~ msgstr "%d. ルートに無効なプレフィックスがあります"
+
+#~ msgid "%d. IPv6 address is invalid"
+#~ msgstr "%d. IPv6 アドレスは無効です"
+
+#~ msgid "%d. IPv6 address has invalid prefix"
+#~ msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
+
+#~ msgid "Failed to convert '%s' value '%s' to uint"
+#~ msgstr "'%s' 値 '%s' を uint に変換するのに失敗しました"
+
+#~ msgid "Secret flags property '%s' not found"
+#~ msgstr "シークレットフラグプロパティー '%s' が見つかりません"
+
+#~ msgid "requires setting '%s' property"
+#~ msgstr "'%s' プロパティーの設定が必要です"
+
+#~ msgid "GSM mobile broadband connection requires a 'gsm' setting"
+#~ msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
+
 #~ msgid "Error: Failed to setup a Wi-Fi hotspot"
 #~ msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"