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.po3743
1 files changed, 1514 insertions, 2229 deletions
diff --git a/po/ja.po b/po/ja.po
index 27ad0b01..f5161565 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,11 +5,12 @@
 # Satoru SATOH <ssato@redhat.com>, 2005-2007.
 # Kiyoto Hashida <khashida@redhat.com>, 2010.
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
+# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 15:00+0200\n"
+"POT-Creation-Date: 2016-06-22 10:02+0200\n"
 "PO-Revision-Date: 2014-01-28 08:31-0500\n"
 "Last-Translator: noriko <noriko@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -18,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.8.4\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -87,21 +88,21 @@ msgstr "エラー: 接続のアクティベーションに失敗: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
+#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
+#: ../clients/cli/general.c:473
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager が起動していません。"
 
-#: ../clients/cli/agent.c:242
+#: ../clients/cli/agent.c:239
 #, fuzzy, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
+#: ../clients/cli/connections.c:237 ../clients/cli/connections.c:259
 msgid "GROUP"
 msgstr "グループ"
 
@@ -113,7 +114,7 @@ msgstr "アドレス"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:262
 msgid "GATEWAY"
 msgstr "ゲートウェイ"
 
@@ -181,7 +182,7 @@ msgstr "管理無し"
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
 msgid "disconnected"
 msgstr "切断済み"
 
@@ -209,11 +210,11 @@ msgstr "接続中(IP の接続性チェック)"
 msgid "connecting (starting secondary connections)"
 msgstr "接続中(セカンダリ接続を開始)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
 msgid "connected"
 msgstr "接続済み"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
 msgid "deactivating"
 msgstr "停止中"
 
@@ -222,52 +223,53 @@ msgid "connection failed"
 msgstr "接続に失敗"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
-#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
-#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
-#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
-#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
+#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
+#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
+#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
+#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
+#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
+#: ../clients/cli/settings.c:3317
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
-#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
-#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
-#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
-#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
-#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
-#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
-#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
-#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
+#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
+#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
+#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
+#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
+#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
+#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
+#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
+#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
+#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
+#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
+#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
+#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
+#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
+#: ../clients/cli/settings.c:3312
 msgid "yes"
 msgstr "はい"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
-#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
-#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
-#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
-#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
-#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
-#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
-#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
+#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
+#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
+#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
+#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
+#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
+#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
+#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
+#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
+#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
+#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
+#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
+#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
+#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
+#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
 msgid "no"
 msgstr "いいえ"
 
@@ -284,7 +286,7 @@ msgid "No reason given"
 msgstr "原因不明"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
 #, c-format
 msgid "Unknown error"
 msgstr "不明なエラー"
@@ -540,8 +542,8 @@ msgid "The device parent's management changed"
 msgstr "このデバイスは削除されました"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
-#: ../libnm/nm-device.c:1839
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1898
+#: ../libnm/nm-device.c:1849
 msgid "Unknown"
 msgstr "不明"
 
@@ -583,73 +585,117 @@ msgid ""
 msgstr ""
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:41
+#: ../clients/cli/connections.c:61
 msgid "Setting name? "
 msgstr "設定名は? "
 
-#: ../clients/cli/connections.c:42
+#: ../clients/cli/connections.c:62
 msgid "Property name? "
 msgstr "プロパティ名は? "
 
-#: ../clients/cli/connections.c:43
+#: ../clients/cli/connections.c:63
 msgid "Enter connection type: "
 msgstr "接続タイプを入力してください: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:46
-msgid "Connection type: "
+#: ../clients/cli/connections.c:66
+#, fuzzy
+msgid "Connection type"
 msgstr "接続タイプ: "
 
-#: ../clients/cli/connections.c:47
-msgid "VPN type: "
+#: ../clients/cli/connections.c:67
+#, fuzzy
+msgid "VPN type"
 msgstr "VPN タイプ: "
 
-#: ../clients/cli/connections.c:48
+#: ../clients/cli/connections.c:68
 #, fuzzy
-msgid "Master: "
+msgid "Master"
 msgstr "ボンドマスター: "
 
-#: ../clients/cli/connections.c:49
-msgid "Connection (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス): "
+#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "トランスポートモード"
 
-#: ../clients/cli/connections.c:50
+#: ../clients/cli/connections.c:75
 #, fuzzy
-msgid "VPN connection (name, UUID, or path): "
-msgstr "接続 (名前、UUID またはパス): "
+msgid "Bluetooth type"
+msgstr "Bluetooth"
+
+#: ../clients/cli/connections.c:81
+#, fuzzy
+msgid "Bonding mode"
+msgstr "リンクのモニタリング"
+
+#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
+#, fuzzy
+msgid "Bonding monitoring mode"
+msgstr "リンクのモニタリング"
+
+#: ../clients/cli/connections.c:88
+#, fuzzy
+msgid "Protocol"
+msgstr "プロトコル %s"
+
+#: ../clients/cli/connections.c:91
+msgid "Wi-Fi mode"
+msgstr "Wi-Fi モード"
+
+#: ../clients/cli/connections.c:97
+#, fuzzy
+msgid "ADSL encapsulation"
+msgstr "DSL 認証"
 
-#: ../clients/cli/connections.c:51
+#: ../clients/cli/connections.c:100
 #, fuzzy
-msgid "Connection(s) (name, UUID, or path): "
+msgid "Tun mode"
+msgstr "トランスポートモード"
+
+#: ../clients/cli/connections.c:105
+#, fuzzy
+msgid "IP Tunnel mode"
+msgstr "接続の編集"
+
+#: ../clients/cli/connections.c:107
+#, fuzzy
+msgid "MACVLAN mode"
+msgstr "VLAN"
+
+#: ../clients/cli/connections.c:109
+#, fuzzy
+msgid "Connection (name, UUID, or path)"
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:52
+#: ../clients/cli/connections.c:110
 #, fuzzy
-msgid "Connection(s) (name, UUID, path or apath): "
+msgid "VPN connection (name, UUID, or path)"
 msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:53
-msgid "Tunnel mode: "
-msgstr ""
+#: ../clients/cli/connections.c:111
+#, fuzzy
+msgid "Connection(s) (name, UUID, or path)"
+msgstr "接続 (名前、UUID またはパス): "
 
-#: ../clients/cli/connections.c:54
-msgid "MACVLAN mode: "
-msgstr ""
+#: ../clients/cli/connections.c:112
+#, fuzzy
+msgid "Connection(s) (name, UUID, path or apath)"
+msgstr "接続 (名前、UUID またはパス): "
 
 #. 0
-#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
+#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
 #: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
 #: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
 #: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
 #: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
 #: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:220
+#: ../clients/cli/devices.c:261
 msgid "NAME"
 msgstr "名前"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
+#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
 msgid "UUID"
 msgstr "UUID"
 
@@ -657,36 +703,36 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
+#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
 #: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
 #: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "タイプ"
 
 #. 2
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:121
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
 #. 3
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:122
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
 #. 5
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:124
 #, fuzzy
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "自動接続"
 
 #. 6
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:125
 msgid "READONLY"
 msgstr "読み込み専用"
 
@@ -695,7 +741,7 @@ msgstr "読み込み専用"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
+#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
@@ -704,7 +750,7 @@ msgstr "DBUS パス"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "アクティブ"
@@ -714,9 +760,9 @@ msgstr "アクティブ"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
+#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
 #: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:262
 msgid "DEVICE"
 msgstr "デバイス"
 
@@ -725,43 +771,42 @@ msgstr "デバイス"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
+#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:37
 msgid "STATE"
 msgstr "状態"
 
 #. 11
-#: ../clients/cli/connections.c:85
+#: ../clients/cli/connections.c:130
 #, fuzzy
 msgid "ACTIVE-PATH"
 msgstr "マスターパス"
 
 #. 2
-#: ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:240
 msgid "DEVICES"
 msgstr "デバイス"
 
 #. 4
-#: ../clients/cli/connections.c:197
+#: ../clients/cli/connections.c:242
 msgid "DEFAULT"
 msgstr "デフォルト"
 
 #. 5
-#: ../clients/cli/connections.c:198
+#: ../clients/cli/connections.c:243
 msgid "DEFAULT6"
 msgstr "デフォルト6"
 
 #. 6
-#: ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:244
 msgid "SPEC-OBJECT"
 msgstr "スペックオブジェクト"
 
 #. 7
 #. 4
-#. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
+#: ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -769,70 +814,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON パス"
 
 #. 10
-#: ../clients/cli/connections.c:203
+#: ../clients/cli/connections.c:248
 msgid "ZONE"
 msgstr "ゾーン"
 
 #. 11
-#: ../clients/cli/connections.c:204
+#: ../clients/cli/connections.c:249
 msgid "MASTER-PATH"
 msgstr "マスターパス"
 
 #. 1
-#: ../clients/cli/connections.c:216
+#: ../clients/cli/connections.c:261
 msgid "USERNAME"
 msgstr "ユーザー名"
 
 #. 3
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:263
 msgid "BANNER"
 msgstr "バナー"
 
 #. 4
-#: ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:264
 msgid "VPN-STATE"
 msgstr "VPN の状態"
 
 #. 5
-#: ../clients/cli/connections.c:220
+#: ../clients/cli/connections.c:265
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
+#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
 msgid "GENERAL"
 msgstr "全般"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
+#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
+#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
+#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:272
+#: ../clients/cli/connections.c:314
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -900,7 +945,7 @@ msgstr ""
 "  load <filename> [ <filename>... ]\n"
 "\n"
 
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -927,7 +972,7 @@ msgid ""
 "well.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:357
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -969,7 +1014,7 @@ msgstr ""
 "nsp    - 接続する NSP を指定します (WiMAX の場合にのみ有効)\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:378
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -990,7 +1035,7 @@ msgstr ""
 "ん)。解除するプロファイルは名前、UUID、D-Bus パスなどで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:390
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1226,7 +1271,7 @@ msgstr ""
 "                  [ip6 <IPv6 アドレス>] [gw6 <IPv6 ゲートウェイ>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:502
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1251,7 +1296,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:525
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1265,7 +1310,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:537
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1292,7 +1337,7 @@ msgstr ""
 "インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:552
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1311,7 +1356,7 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:563
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1335,7 +1380,7 @@ msgstr ""
 "インテラクティブなエディタで新しい接続プロファイルを追加します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:575
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1347,7 +1392,7 @@ msgstr ""
 "\n"
 "ディスクからすべての接続ファイルを再読み込みします。\n"
 
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:583
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1369,7 +1414,7 @@ msgstr ""
 "状態を認識させるため必ずこのコマンドを使用してください。\n"
 "\n"
 
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:595
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1384,7 +1429,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:608
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1403,1311 +1448,877 @@ msgstr ""
 "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
 "\n"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:686
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:688
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:692
 msgid "deactivated"
 msgstr "停止しました"
 
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:704
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続(準備)"
 
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:706
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続(認証が必要)"
 
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:708
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:710
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続(IP 設定を取得)"
 
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:712
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:714
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:716
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:786
 #, fuzzy, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "接続の保存中にエラーが発生しました: %s"
 
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:806
 msgid "Connection profile details"
 msgstr "接続プロファイルの詳細"
 
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
 #, fuzzy, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
 msgid "never"
 msgstr "しない"
 
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1199
 #, fuzzy
 msgid "Activate connection details"
 msgstr "アクティブな接続の詳細"
 
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1435
 #, fuzzy, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
 #, fuzzy, c-format
 msgid "'%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
 #. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1680
 #, fuzzy
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1681
 #, fuzzy
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager がスリープ状態に入りました"
 
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#.
+#. * TODO(?): complete uuid, path or id
+#. if (nmc->complete) {
+#. quit ();
+#. }
+#.
+#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
+#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
+#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
+#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
+#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
+#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
+#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
+#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
+#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
+#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
+#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
+#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
+#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
+#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
+#: ../clients/cli/devices.c:3564
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1742
 #, fuzzy, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - そのような接続はありません。"
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
+#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
+#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
+#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
+#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
+#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
+#: ../clients/cli/general.c:832
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:1897
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デバイス '%s' 上にアクティブな接続はありません"
 
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:1905
 msgid "no active connection or device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:1956
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:1959
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用のデバイスが見つかりません"
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:1971
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
 msgid "none"
 msgstr "なし"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1975
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:1977
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1979
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1981
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:1983
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1985
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:1987
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:1989
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:1991
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:1993
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
+#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:2023
 #, fuzzy, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:2030 ../clients/cli/connections.c:6126
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "エラー: 接続のアクティベートに失敗しました。\n"
+
+#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "エラー: 接続のアクティベートに失敗しました。"
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2106
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN 接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2114
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2193
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2278
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'の読み込みに失敗: %s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2290
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2298
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2311
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2367
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明なデバイス '%s' です。"
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2372
 msgid "neither a valid connection nor device given"
 msgstr "有効な接続、デバイスいずれも指定されていません"
 
-#: ../clients/cli/connections.c:2402
+#: ../clients/cli/connections.c:2458
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "エラー: 接続 '%s' が存在しません。"
 
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
+#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
+#: ../clients/cli/devices.c:3397
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2518
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2539
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) が正常に削除されました。\n"
 
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2555
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
+#: ../clients/cli/connections.c:8226
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2662
 #, fuzzy, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' はアクティブな接続ではありません。"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
 #, fuzzy, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: '%s' はアクティブな接続ではありません。"
 
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2672
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブな接続がありません。"
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' は [%s] にはありません"
 
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3280
 #, c-format
-msgid "Error: '%s': '%s' is not a valid %s MAC address."
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
-#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
-msgid "InfiniBand"
-msgstr "InfiniBand"
-
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
-msgid "Ethernet"
-msgstr "Ethernet"
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:3053
-#, c-format
-msgid "Error: 'mtu': '%s' is not a valid MTU."
-msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
+#: ../clients/cli/connections.c:3451
+#, fuzzy, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "エラー: システム設定を取得できませんでした"
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3462
 #, c-format
-msgid "Error: 'parent': '%s' is not a valid interface name."
-msgstr "エラー: 'parent': '%s' は有効なインターフェース名ではありません。"
+msgid "Error: invalid property '%s': %s."
+msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3479
 #, c-format
-msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
-msgstr "エラー: 'p-key': '%s' は有効な InfiniBand P_KEY ではありません。"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3498
 #, fuzzy, c-format
-msgid "Error: '%s' is not a valid UID/GID."
-msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3524
 #, fuzzy, c-format
-msgid "Error: '%s': '%s' is not a valid %s %s."
-msgstr "エラー: '%s': '%s' は無効です; %s "
+msgid "Error: '%s' is mandatory."
+msgstr "エラー: '%s' 設定はありません\n"
 
-#: ../clients/cli/connections.c:3162
-msgid "Wi-Fi mode"
-msgstr "Wi-Fi モード"
+#: ../clients/cli/connections.c:3556
+#, fuzzy, c-format
+msgid "Error: invalid slave type; %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3171
-#, fuzzy
-msgid "InfiniBand transport mode"
-msgstr "トランスポートモード"
+#: ../clients/cli/connections.c:3569
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3183
-msgid "ADSL protocol"
-msgstr "ADSL プロトコル"
+#: ../clients/cli/connections.c:3744
+#, fuzzy, c-format
+msgid "Error: bad connection type: %s."
+msgstr "エラー: 無効な接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3194
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 認証"
+#: ../clients/cli/connections.c:3802
+#, fuzzy, c-format
+msgid "Error: '%s' is not a valid interface nor '*'."
+msgstr ""
+"エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
 
-#: ../clients/cli/connections.c:3203
+#: ../clients/cli/connections.c:3825
 #, fuzzy
-msgid "TUN device mode"
-msgstr "このデバイスは削除されました"
+msgid "Error: master is required"
+msgstr "エラー: 'マスター' が必要です。"
 
-#: ../clients/cli/connections.c:3216
-#, c-format
-msgid "Error: 'flags': '%s' is not valid; use <0-7>."
-msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
+#: ../clients/cli/connections.c:3883
+#, fuzzy, c-format
+msgid "Error: error adding bond option '%s=%s'."
+msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:3238
+#: ../clients/cli/connections.c:3914
 #, c-format
-msgid "Error: '%s': '%s' is not valid; %s "
-msgstr "エラー: '%s': '%s' は無効です; %s "
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+"エラー: '%s' は無効なモニタリングモードです; '%s' または '%s' を使用してくだ"
+"さい。\n"
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:3945
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
+"エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
 
-#: ../clients/cli/connections.c:3441
-#, c-format
-msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
-msgstr "エラー: '%s': '%s' は無効です; <%u-%u> を使用してください。"
+#: ../clients/cli/connections.c:3972
+#, fuzzy
+msgid "Interface name [*]"
+msgstr "インターフェース名 [*]: "
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
-#, fuzzy, c-format
-msgid "There is %d optional argument for '%s' connection type.\n"
-msgid_plural "There are %d optional arguments for '%s' connection type.\n"
-msgstr[0] "'%s' 接続タイプには 1 種類のオプション引数があります。\n"
+#: ../clients/cli/connections.c:3976
+#, fuzzy
+msgid "PPPoE username"
+msgstr "PPPoE ユーザー名: "
 
-#: ../clients/cli/connections.c:3500
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "指定しますか? (yes/no) [yes] "
+#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
+#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
+#, fuzzy
+msgid "Password [none]"
+msgstr "パスワード [none]: "
 
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
-msgid "ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:3978
+#, fuzzy
+msgid "Service [none]"
+msgstr "サービス [none]: "
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
-msgid "MTU [auto]: "
+#: ../clients/cli/connections.c:3979 ../clients/cli/connections.c:3982
+#: ../clients/cli/connections.c:3991
+#, fuzzy
+msgid "MTU [auto]"
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
-msgid "MAC [none]: "
+#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
+#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:4036
+#, fuzzy
+msgid "MAC [none]"
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3544
-msgid "Cloned MAC [none]: "
+#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
+#, fuzzy
+msgid "Cloned MAC [none]"
 msgstr "クローンの MAC [none]: "
 
-#: ../clients/cli/connections.c:3592
-#, fuzzy, c-format
-msgid "Transport mode %s"
-msgstr "トランスポートモード"
-
-#: ../clients/cli/connections.c:3605
-msgid "Parent interface [none]: "
+#: ../clients/cli/connections.c:3986
+#, fuzzy
+msgid "Parent interface [none]"
 msgstr "親インターフェース [none]: "
 
-#: ../clients/cli/connections.c:3616
-msgid "P_KEY [none]: "
+#: ../clients/cli/connections.c:3987
+#, fuzzy
+msgid "P_KEY [none]"
 msgstr "P_KEY [none]: "
 
-#: ../clients/cli/connections.c:3626
-#, c-format
-msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
-msgstr "エラー: 'parent' を指定する場合、'p-key' は必須です。\n"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
-#, fuzzy, c-format
-msgid "Mode %s"
-msgstr "モード"
-
-#. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
-#: ../libnm/nm-device.c:1808
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
-msgid "PPPoE"
-msgstr ""
-
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
-msgid "Password [none]: "
-msgstr "パスワード [none]: "
+#. 0
+#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
+#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
 
-#: ../clients/cli/connections.c:3700
-msgid "Service [none]: "
-msgstr "サービス [none]: "
+#: ../clients/cli/connections.c:3994
+#, fuzzy
+msgid "WiMAX NSP name"
+msgstr "WiMAX NSP 名: "
 
-#. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
+#: ../clients/cli/connections.c:3996
 #, fuzzy
-msgid "mobile broadband"
-msgstr "モバイルブロードバンド"
+msgid "APN"
+msgstr "AP"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
-msgid "Username [none]: "
+#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
+#: ../clients/cli/connections.c:4042
+#, fuzzy
+msgid "Username [none]"
 msgstr "ユーザー名 [none]: "
 
-#. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
-msgid "bluetooth"
-msgstr "bluetooth"
-
-#: ../clients/cli/connections.c:3756
-#, fuzzy, c-format
-msgid "Bluetooth type %s"
-msgstr "Bluetooth"
+#: ../clients/cli/connections.c:4001
+#, fuzzy
+msgid "Bluetooth device address"
+msgstr "Bluetooth デバイスアドレス: "
 
-#: ../clients/cli/connections.c:3762
-#, c-format
-msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "エラー: ''bt-type': '%s' は有効な bluetooth タイプではありません。\n"
+#: ../clients/cli/connections.c:4004
+#, fuzzy
+msgid "VLAN parent device or connection UUID"
+msgstr "VLAN 親デバイスまたは接続 UUID: "
 
-#. Ask for optional 'vlan' arguments.
-#. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
-#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
-msgid "VLAN"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:4006
+#, fuzzy
+msgid "VLAN ID (<0-4094>)"
+msgstr "VLAN ID <0-4095>: "
 
-#: ../clients/cli/connections.c:3794
-msgid "VLAN flags (<0-7>) [none]: "
+#: ../clients/cli/connections.c:4007
+#, fuzzy
+msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:3805
-msgid "Ingress priority maps [none]: "
+#: ../clients/cli/connections.c:4008
+#, fuzzy
+msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:3816
-msgid "Egress priority maps [none]: "
+#: ../clients/cli/connections.c:4009
+#, fuzzy
+msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]: "
 
-#: ../clients/cli/connections.c:3827
-msgid "Bonding mode [balance-rr]: "
-msgstr "ボンドモード [balance-rr]: "
-
-#. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
-msgid "bond"
-msgstr ""
-
-#: ../clients/cli/connections.c:3865
-msgid "Bonding primary interface [none]: "
+#: ../clients/cli/connections.c:4012
+#, fuzzy
+msgid "Bonding primary interface [none]"
 msgstr "ボンドのプライマリインターフェース [none]:"
 
-#: ../clients/cli/connections.c:3868
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name.\n"
-msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。\n"
-
-#: ../clients/cli/connections.c:3876
-#, fuzzy, c-format
-msgid "Bonding monitoring mode %s"
-msgstr "リンクのモニタリング"
-
-#: ../clients/cli/connections.c:3882
-#, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"エラー: '%s' は無効なモニタリングモードです; '%s' または '%s' を使用してくだ"
-"さい。\n"
-
-#: ../clients/cli/connections.c:3891
-msgid "Bonding miimon [100]: "
+#: ../clients/cli/connections.c:4016
+#, fuzzy
+msgid "Bonding miimon [100]"
 msgstr "ボンドの miimon [100]:"
 
-#: ../clients/cli/connections.c:3894
-#, c-format
-msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'miimon': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3902
-msgid "Bonding downdelay [0]: "
+#: ../clients/cli/connections.c:4017
+#, fuzzy
+msgid "Bonding downdelay [0]"
 msgstr "ボンドの downdelay [0]: "
 
-#: ../clients/cli/connections.c:3905
-#, c-format
-msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'downdelay': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3913
-msgid "Bonding updelay [0]: "
+#: ../clients/cli/connections.c:4018
+#, fuzzy
+msgid "Bonding updelay [0]"
 msgstr "ボンドの updelay [0]: "
 
-#: ../clients/cli/connections.c:3916
-#, c-format
-msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'updelay': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3925
-msgid "Bonding arp-interval [0]: "
+#: ../clients/cli/connections.c:4019
+#, fuzzy
+msgid "Bonding arp-interval [0]"
 msgstr "ボンドの arp-interval [0]: "
 
-#: ../clients/cli/connections.c:3928
-#, c-format
-msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
-msgstr "エラー: 'arp-interval': '%s' は無効な数値です <0-%u>。\n"
-
-#. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
-msgid "Bonding arp-ip-target [none]: "
+#: ../clients/cli/connections.c:4021
+#, fuzzy
+msgid "Bonding arp-ip-target [none]"
 msgstr "ボンドの arp-ip-target [none]: "
 
-#: ../clients/cli/connections.c:3943
-msgid "LACP rate ('slow' or 'fast') [slow]: "
-msgstr ""
-
-#: ../clients/cli/connections.c:3949
-#, fuzzy, c-format
-msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+#: ../clients/cli/connections.c:4023
+msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr ""
-"エラー: 'マスター': '%s' は有効な UUID でもインターフェースでもありません。"
 
-#: ../clients/cli/connections.c:3972
-msgid "Team JSON configuration [none]: "
+#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
+#, fuzzy
+msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]: "
 
-#: ../clients/cli/connections.c:3989
-msgid "team"
-msgstr "team "
-
-#: ../clients/cli/connections.c:3995
-msgid "team-slave"
-msgstr "team-slave"
-
-#. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
+#: ../clients/cli/connections.c:4027
 #, fuzzy
-msgid "bridge"
-msgstr "ブリッジ"
-
-#: ../clients/cli/connections.c:4013
-#, fuzzy, c-format
-msgid "Enable STP %s"
+msgid "Enable STP [no]"
 msgstr "STP の有効化 (yes/no) [yes]: "
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy, c-format
-msgid "Error: 'stp': %s.\n"
-msgstr "エラー:'stp': %s。"
-
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4029
 #, fuzzy
-msgid "STP priority [32768]: "
+msgid "STP priority [32768]"
 msgstr "STP の優先度 [128]: "
 
 #: ../clients/cli/connections.c:4030
-#, c-format
-msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
-msgstr "エラー: 'priority': '%s' は無効な数値です <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4038
-msgid "Forward delay [15]: "
+#, fuzzy
+msgid "Forward delay [15]"
 msgstr "フォワード遅延 [15]:"
 
-#: ../clients/cli/connections.c:4042
-#, c-format
-msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
-msgstr "エラー: 'forward-delay': '%s' は無効な数値です <2-30>。\n"
-
-#: ../clients/cli/connections.c:4051
-msgid "Hello time [2]: "
+#: ../clients/cli/connections.c:4031
+#, fuzzy
+msgid "Hello time [2]"
 msgstr "Hello タイム [2]: "
 
-#: ../clients/cli/connections.c:4055
-#, c-format
-msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
-msgstr "エラー: 'hello-time': '%s' は無効な数値です <1-10>。\n"
-
-#: ../clients/cli/connections.c:4063
-msgid "Max age [20]: "
+#: ../clients/cli/connections.c:4032
+#, fuzzy
+msgid "Max age [20]"
 msgstr "最大エイジ [20]: "
 
-#: ../clients/cli/connections.c:4067
-#, c-format
-msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
-msgstr "エラー: 'max-age': '%s' は無効な数値です <6-40>。\n"
-
-#: ../clients/cli/connections.c:4075
-msgid "MAC address ageing time [300]: "
+#: ../clients/cli/connections.c:4033
+#, fuzzy
+msgid "MAC address ageing time [300]"
 msgstr "MAC アドレスのエージングタイム [300]:"
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4034
 #, c-format
-msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
-msgstr "エラー: 'ageing-time': '%s' は無効な数値です <0-1000000>。\n"
-
-#: ../clients/cli/connections.c:4088
-#, c-format
-msgid "Enable IGMP snooping %s"
+msgid "Enable IGMP snooping %s [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4093
-#, fuzzy, c-format
-msgid "Error: 'multicast-snooping': %s.\n"
-msgstr "エラー:'stp': %s。"
-
-#. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
+#: ../clients/cli/connections.c:4037
 #, fuzzy
-msgid "bridge-slave"
-msgstr "team-slave"
-
-#: ../clients/cli/connections.c:4125
-msgid "Bridge port priority [32]: "
+msgid "Bridge port priority [32]"
 msgstr "ブリッジポートの優先度 [32]:"
 
-#: ../clients/cli/connections.c:4138
-msgid "Bridge port STP path cost [100]: "
+#: ../clients/cli/connections.c:4038
+#, fuzzy
+msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジポートの STP パスコスト [100]: "
 
-#: ../clients/cli/connections.c:4152
-#, fuzzy, c-format
-msgid "Hairpin %s"
+#: ../clients/cli/connections.c:4039
+#, fuzzy
+msgid "Hairpin [no]"
 msgstr "ヘアピンモード"
 
-#: ../clients/cli/connections.c:4157
-#, fuzzy, c-format
-msgid "Error: 'hairpin': %s.\n"
-msgstr "エラー: 'ヘアピン': %s。"
-
-#. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
-#: ../libnm/nm-device.c:1806
-msgid "OLPC Mesh"
-msgstr "OLPC メッシュ"
-
-#: ../clients/cli/connections.c:4189
-msgid "OLPC Mesh channel [1]: "
+#: ../clients/cli/connections.c:4044
+#, fuzzy
+msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュチャンネル [1]: "
 
-#: ../clients/cli/connections.c:4192
-#, c-format
-msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
-msgstr "エラー: 'channel': '%s' は無効な数値です <1-13>。\n"
-
-#: ../clients/cli/connections.c:4200
-msgid "DHCP anycast MAC address [none]: "
+#: ../clients/cli/connections.c:4045
+#, fuzzy
+msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]: "
 
-#. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
-#: ../libnm/nm-device.c:1822
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../clients/cli/connections.c:4227
-#, fuzzy, c-format
-msgid "ADSL encapsulation %s"
-msgstr "ADSL 接続 %d"
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#.
+#: ../clients/cli/connections.c:4046
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "ユーザー名"
 
-#. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
-msgid "macvlan"
-msgstr ""
+#: ../clients/cli/connections.c:4052
+#, fuzzy
+msgid "MACVLAN parent device or connection UUID"
+msgstr "VLAN 親デバイスまたは接続 UUID: "
 
-#: ../clients/cli/connections.c:4251
-#, c-format
-msgid "Tap %s"
+#: ../clients/cli/connections.c:4055
+msgid "Tap [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4256
-#, fuzzy, c-format
-msgid "Error: 'tap': %s.\n"
-msgstr "エラー:'stp': %s。"
+#: ../clients/cli/connections.c:4057
+#, fuzzy
+msgid "VXLAN ID"
+msgstr "VLAN ID <0-4095>: "
 
-#. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
-#: ../libnm/nm-device.c:1826
-msgid "VXLAN"
-msgstr ""
+#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
+#, fuzzy
+msgid "Remote"
+msgstr "削除"
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
 #, fuzzy
-msgid "Parent device [none]: "
+msgid "Parent device [none]"
 msgstr "親インターフェース [none]: "
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
-#, fuzzy, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr ""
-"エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
-
-#: ../clients/cli/connections.c:4291
+#: ../clients/cli/connections.c:4060
 #, fuzzy
-msgid "Local address [none]: "
+msgid "Local address [none]"
 msgstr "DHCP anycast MAC アドレス [none]: "
 
-#: ../clients/cli/connections.c:4296
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
-
-#: ../clients/cli/connections.c:4305
-msgid "Minimum source port [0]: "
+#: ../clients/cli/connections.c:4061
+msgid "Minimum source port [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4309
-#, fuzzy, c-format
-msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'priority': '%s' は無効な数値です <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4318
-msgid "Maximum source port [0]: "
+#: ../clients/cli/connections.c:4062
+msgid "Maximum source port [0]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4322
-#, fuzzy, c-format
-msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'priority': '%s' は無効な数値です <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4331
+#: ../clients/cli/connections.c:4063
 #, fuzzy
-msgid "Destination port [8472]: "
+msgid "Destination port [8472]"
 msgstr "送信先"
 
-#: ../clients/cli/connections.c:4335
-#, fuzzy, c-format
-msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "エラー: 'miimon': '%s' は無効な数値です <0-%u>。\n"
-
-#: ../clients/cli/connections.c:4374
+#: ../clients/cli/connections.c:4066
 #, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]: "
-msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4376
-#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]: "
-msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4390
-#, c-format
-msgid "  Address successfully added: %s\n"
-msgstr " アドレスが正常に追加されました: %s\n"
-
-#: ../clients/cli/connections.c:4392
-#, c-format
-msgid "  Warning: address already present: %s\n"
-msgstr " 警告: アドレスがすでにあります: %s\n"
-
-#: ../clients/cli/connections.c:4394
-#, c-format
-msgid "  Warning: ignoring garbage at the end: '%s'\n"
-msgstr "  警告: 末尾の不要なデータを無視しています: '%s'\n"
-
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
-msgid "Error: "
-msgstr "エラー: "
-
-#: ../clients/cli/connections.c:4416
-#, fuzzy
-msgid "IPv4 gateway [none]: "
-msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4419
-#, fuzzy
-msgid "IPv6 gateway [none]: "
-msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
-
-#: ../clients/cli/connections.c:4439
-#, fuzzy, c-format
-msgid "Error: invalid gateway address '%s'\n"
-msgstr "エラー:  '%s' は無効な追加引数です。"
-
-#. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
-#, fuzzy, c-format
-msgid "Do you want to add IP addresses? %s"
-msgstr "IP アドレスを追加しますか? (yes/no) [yes] "
-
-#: ../clients/cli/connections.c:4460
-#, c-format
-msgid "Press <Enter> to finish adding addresses.\n"
-msgstr "<Enter> を押してアドレスの追加を終了します。\n"
-
-#. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
-#: ../libnm/nm-device.c:1830
-msgid "Tun"
-msgstr ""
-
-#: ../clients/cli/connections.c:4509
-#, fuzzy
-msgid "User ID [none]: "
+msgid "User ID [none]"
 msgstr "ユーザー名 [none]: "
 
-#: ../clients/cli/connections.c:4522
+#: ../clients/cli/connections.c:4067
 #, fuzzy
-msgid "Group ID [none]: "
+msgid "Group ID [none]"
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:4536
-#, c-format
-msgid "Enable PI %s"
-msgstr ""
-
-#: ../clients/cli/connections.c:4541
-#, fuzzy, c-format
-msgid "Error: 'pi': %s.\n"
-msgstr "エラー:'stp': %s。"
+#: ../clients/cli/connections.c:4068
+#, fuzzy
+msgid "Enable PI [no]"
+msgstr "STP の有効化 (yes/no) [yes]: "
 
-#: ../clients/cli/connections.c:4549
-#, c-format
-msgid "Enable VNET header %s"
+#: ../clients/cli/connections.c:4070
+msgid "Enable VNET header [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy, c-format
-msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "エラー: 'vpn タイプ': %s。"
-
-#: ../clients/cli/connections.c:4562
-#, c-format
-msgid "Enable multi queue %s"
+#: ../clients/cli/connections.c:4072
+msgid "Enable multi queue [no]"
 msgstr ""
 
-#: ../clients/cli/connections.c:4567
-#, fuzzy, c-format
-msgid "Error: 'multi-queue': %s.\n"
-msgstr "エラー: 'モード': %s。"
+#: ../clients/cli/connections.c:4075
+#, fuzzy
+msgid "Local endpoint [none]"
+msgstr "親インターフェース [none]: "
 
-#. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
-msgid "IP Tunnel"
-msgstr ""
+#: ../clients/cli/connections.c:4078
+#, fuzzy
+msgid "IPv4 address (IP[/plen]) [none]"
+msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
 
-#: ../clients/cli/connections.c:4586
+#: ../clients/cli/connections.c:4079
 #, fuzzy
-msgid "Local endpoint [none]: "
-msgstr "親インターフェース [none]: "
+msgid "IPv4 gateway [none]"
+msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
 
-#: ../clients/cli/connections.c:4592
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+#: ../clients/cli/connections.c:4080
+#, fuzzy
+msgid "IPv6 address (IP[/plen]) [none]"
+msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
 
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
-#, c-format
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "エラー: <setting>.<property> 引数がありません。"
+#: ../clients/cli/connections.c:4081
+#, fuzzy
+msgid "IPv6 gateway [none]"
+msgstr "IPv6 アドレス (IP[/plen] [gateway]) [none]: "
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:4205
 #, fuzzy, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../clients/cli/connections.c:4681
-#, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "エラー: 無効な <setting>.<property> '%s' です。"
+#: ../clients/cli/connections.c:4252
+msgid "Error: <setting>.<property> argument is missing."
+msgstr "エラー: <setting>.<property> 引数がありません。"
 
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4274
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
 
-#: ../clients/cli/connections.c:4700
+#: ../clients/cli/connections.c:4301
 #, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "エラー: システム設定を取得できませんでした"
-
-#: ../clients/cli/connections.c:4710
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
+msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
+msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4315
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "エラー: 無効な <setting>.<property> '%s' です。"
 
-#: ../clients/cli/connections.c:4741
+#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
 #, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
-
-#: ../clients/cli/connections.c:4775
-#, c-format
-msgid ""
-"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
-msgstr ""
-
-#: ../clients/cli/connections.c:4783
-#, fuzzy
-msgid "Error: redundant 'master' option."
-msgstr "エラー: %s オプション用の引数がありません。"
-
-#: ../clients/cli/connections.c:4796
-msgid "Error: 'master' is required."
-msgstr "エラー: 'マスター' が必要です。"
-
-#: ../clients/cli/connections.c:4950
-#, c-format
-msgid "Error: 'parent': not valid without 'p-key'."
-msgstr "エラー: 'parent': 'p-key' がないと使用できません。"
-
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
-msgid "SSID: "
-msgstr "SSID: "
-
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
-msgid "Error: 'ssid' is required."
-msgstr "エラー: 'ssid' が必要です。"
-
-#: ../clients/cli/connections.c:5072
-msgid "WiMAX NSP name: "
-msgstr "WiMAX NSP 名: "
-
-#: ../clients/cli/connections.c:5075
-msgid "Error: 'nsp' is required."
-msgstr "エラー: 'nsp' が必要です。"
-
-#: ../clients/cli/connections.c:5127
-msgid "PPPoE username: "
-msgstr "PPPoE ユーザー名: "
-
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
-msgid "Error: 'username' is required."
-msgstr "エラー: 「ユーザー名」を入力してください。"
-
-#: ../clients/cli/connections.c:5199
-msgid "APN: "
-msgstr "APN: "
-
-#: ../clients/cli/connections.c:5202
-msgid "Error: 'apn' is required."
-msgstr "エラー: 'apn' が必要です。"
-
-#: ../clients/cli/connections.c:5260
-msgid "Bluetooth device address: "
-msgstr "Bluetooth デバイスアドレス: "
-
-#: ../clients/cli/connections.c:5263
-msgid "Error: 'addr' is required."
-msgstr "エラー: 'addr' が必要です。"
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
 
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:4361
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr ""
-"エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
-
-#: ../clients/cli/connections.c:5348
-msgid "VLAN parent device or connection UUID: "
-msgstr "VLAN 親デバイスまたは接続 UUID: "
-
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
-msgid "Error: 'dev' is required."
-msgstr "エラー: 'dev' が必要です。"
-
-#: ../clients/cli/connections.c:5355
-#, fuzzy
-msgid "VLAN ID <0-4094>: "
-msgstr "VLAN ID <0-4095>: "
-
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
-msgid "Error: 'id' is required."
-msgstr "エラー: 'id' が必要です。"
-
-#: ../clients/cli/connections.c:5364
-#, fuzzy, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#: ../clients/cli/connections.c:4477
 #, c-format
-msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+msgid ""
+"You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr ""
-"エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
 
-#: ../clients/cli/connections.c:5506
-#, c-format
-msgid "Error: 'mode': %s."
-msgstr "エラー: 'モード': %s。"
-
-#: ../clients/cli/connections.c:5515
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name."
-msgstr "エラー: 'primary': '%s' は無効なインターフェース名です。"
-
-#: ../clients/cli/connections.c:5738
-#, c-format
-msgid "Error: 'stp': %s."
-msgstr "エラー:'stp': %s。"
-
-#: ../clients/cli/connections.c:5747
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:4515
 #, fuzzy, c-format
-msgid "Error: 'multicast-snooping': %s."
-msgstr "エラー:'stp': %s。"
-
-#: ../clients/cli/connections.c:5866
-#, c-format
-msgid "Error: 'hairpin': %s."
-msgstr "エラー: 'ヘアピン': %s。"
-
-#: ../clients/cli/connections.c:5915
-msgid "Error: 'vpn-type' is required."
-msgstr "エラー: ’vpn タイプ’ が必要です。"
+msgid "There is %d optional setting for %s.\n"
+msgid_plural "There are %d optional settings for %s.\n"
+msgstr[0] "'%s' 接続タイプには 1 種類のオプション引数があります。\n"
 
-#: ../clients/cli/connections.c:5922
+#: ../clients/cli/connections.c:4518
 #, fuzzy, c-format
-msgid "Warning: 'vpn-type': %s not known.\n"
-msgstr "エラー: 'vpn タイプ': %s。"
-
-#: ../clients/cli/connections.c:5983
-#, c-format
-msgid "Error: 'channel': '%s' is not valid; use <1-13>."
-msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
-
-#: ../clients/cli/connections.c:6034
-msgid "Username: "
-msgstr "ユーザー名: "
-
-#: ../clients/cli/connections.c:6043
-#, c-format
-msgid "Protocol %s"
-msgstr "プロトコル %s"
-
-#: ../clients/cli/connections.c:6046
-msgid "Error: 'protocol' is required."
-msgstr "エラー: 'protocol' が必要です。"
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "指定しますか? (yes/no) [yes] "
 
-#: ../clients/cli/connections.c:6105
+#: ../clients/cli/connections.c:4532
 #, fuzzy
-msgid "MACVLAN parent device or connection UUID: "
-msgstr "VLAN 親デバイスまたは接続 UUID: "
+msgid "Wired Ethernet"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
 #, fuzzy
-msgid "Error: 'mode' is required."
-msgstr "エラー: 'dev' が必要です。"
+msgid "InfiniBand connection"
+msgstr "InfiniBand 接続 %d"
 
-#: ../clients/cli/connections.c:6131
+#: ../clients/cli/connections.c:4536
 #, fuzzy
-msgid "Error: 'mode' is not valid."
-msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
-
-#: ../clients/cli/connections.c:6144
-#, fuzzy, c-format
-msgid "Error: 'tap': %s."
-msgstr "エラー:'stp': %s。"
-
-#: ../clients/cli/connections.c:6230
-#, fuzzy, c-format
-msgid "Error: 'pi': %s."
-msgstr "エラー:'stp': %s。"
-
-#: ../clients/cli/connections.c:6241
-#, fuzzy, c-format
-msgid "Error: 'vnet-hdr': %s."
-msgstr "エラー: 'vpn タイプ': %s。"
-
-#: ../clients/cli/connections.c:6252
-#, fuzzy, c-format
-msgid "Error: 'multi-queue': %s."
-msgstr "エラー: 'モード': %s。"
-
-#: ../clients/cli/connections.c:6321
-#, fuzzy, c-format
-msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "エラー: '%s': '%s' は無効です; %s "
-
-#: ../clients/cli/connections.c:6327
-msgid "Remote endpoint: "
-msgstr ""
+msgid "Wi-Fi connection"
+msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+#: ../clients/cli/connections.c:4538
 #, fuzzy
-msgid "Error: 'remote' is required."
-msgstr "エラー: 'マスター' が必要です。"
-
-#: ../clients/cli/connections.c:6337
-#, fuzzy, c-format
-msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
-
-#: ../clients/cli/connections.c:6351
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+msgid "WiMAX connection"
+msgstr "CDMA 接続 %d"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
-#, fuzzy, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name."
+#: ../clients/cli/connections.c:4540
+msgid "PPPoE"
 msgstr ""
-"エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
 
-#: ../clients/cli/connections.c:6421
+#: ../clients/cli/connections.c:4542
 #, fuzzy
-msgid "VXLAN ID: "
-msgstr "VLAN ID <0-4095>: "
+msgid "CDMA mobile broadband connection"
+msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:4544
 #, fuzzy
-msgid "Remote: "
-msgstr "削除"
-
-#: ../clients/cli/connections.c:6438
-#, fuzzy, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
-
-#: ../clients/cli/connections.c:6464
-#, fuzzy, c-format
-msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+msgid "GSM mobile broadband connection"
+msgstr "モバイルブロードバンド接続 %d"
 
-#: ../clients/cli/connections.c:6473
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+#: ../clients/cli/connections.c:4546
+#, fuzzy
+msgid "bluetooth connection"
+msgstr "ボンド接続 %d"
 
-#: ../clients/cli/connections.c:6482
-#, fuzzy, c-format
-msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
+#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
+#, fuzzy
+msgid "VLAN connection"
+msgstr "VLAN 接続 %d"
 
-#: ../clients/cli/connections.c:6491
-#, fuzzy, c-format
-msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
+#: ../clients/cli/connections.c:4550
+#, fuzzy
+msgid "Bond device"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:6500
-#, fuzzy, c-format
-msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
+#: ../clients/cli/connections.c:4552
+#, fuzzy
+msgid "Team device"
+msgstr "このデバイスは削除されました"
 
-#: ../clients/cli/connections.c:6540
-#, c-format
-msgid "Error: '%s' is not a valid connection type."
-msgstr "エラー: '%s' は無効な接続タイプです。"
+#: ../clients/cli/connections.c:4554
+#, fuzzy
+msgid "Team port"
+msgstr "team "
 
-#: ../clients/cli/connections.c:6581
-#, c-format
-msgid "Error: IPv4 gateway specified without IPv4 addresses"
-msgstr ""
+#: ../clients/cli/connections.c:4556
+#, fuzzy
+msgid "Bridge device"
+msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:6585
-#, c-format
-msgid "Error: multiple IPv4 gateways specified"
-msgstr "エラー: 複数の IPv4 ゲートウェイが指定されています"
+#: ../clients/cli/connections.c:4558
+#, fuzzy
+msgid "Bridge port"
+msgstr "ブリッジ"
 
-#: ../clients/cli/connections.c:6589
-#, c-format
-msgid "Error: Invalid IPv4 gateway '%s'"
-msgstr "エラー: 無効な IPv4 ゲートウェイ '%s'"
+#: ../clients/cli/connections.c:4560 ../src/nm-manager.c:3716
+#, fuzzy
+msgid "VPN connection"
+msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:6614
-#, c-format
-msgid "Error: IPv6 gateway specified without IPv6 addresses"
-msgstr ""
+#: ../clients/cli/connections.c:4562
+#, fuzzy
+msgid "OLPC Mesh connection"
+msgstr "CDMA 接続 %d"
 
-#: ../clients/cli/connections.c:6618
-#, c-format
-msgid "Error: multiple IPv6 gateways specified"
-msgstr "エラー: 複数の IPv6 ゲートウェイが指定されています"
+#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
+#, fuzzy
+msgid "ADSL connection"
+msgstr "ADSL 接続 %d"
 
-#: ../clients/cli/connections.c:6622
-#, c-format
-msgid "Error: Invalid IPv6 gateway '%s'"
-msgstr "エラー: 無効な IPv6 ゲートウェイ '%s'"
+#: ../clients/cli/connections.c:4566
+#, fuzzy
+msgid "macvlan connection"
+msgstr "ボンド接続 %d"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
+#, fuzzy
+msgid "VXLAN connection"
+msgstr "VLAN 接続 %d"
 
-#: ../clients/cli/connections.c:6675
-#, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+#: ../clients/cli/connections.c:4570
+#, fuzzy
+msgid "Tun device"
+msgstr "このデバイスは削除されました"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "エラー: 'タイプ' 引数が必要です。"
+#: ../clients/cli/connections.c:4572
+#, fuzzy
+msgid "IPv4 protocol"
+msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:6959
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "エラー: 無効な接続タイプ; %s。"
+#: ../clients/cli/connections.c:4574
+#, fuzzy
+msgid "IPv6 protocol"
+msgstr "ADSL プロトコル"
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
 #, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "エラー: '自動接続': %s。"
+msgid "Error: value for '%s' argument is required."
+msgstr "エラー: '%s' 引数の値が必要です。"
 
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:4663
 #, fuzzy, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー:'stp': %s。"
 
-#: ../clients/cli/connections.c:6995
-msgid "Interface name [*]: "
-msgstr "インターフェース名 [*]: "
-
-#: ../clients/cli/connections.c:7000
-#, c-format
-msgid "Error: 'ifname' argument is required."
-msgstr "エラー: 「ifname」引数を入力してください。"
-
-#: ../clients/cli/connections.c:7002
-#, c-format
-msgid "Error: mandatory 'ifname' not seen before '%s'."
-msgstr ""
-
-#: ../clients/cli/connections.c:7011
-#, c-format
-msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
-msgstr ""
-"エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+#: ../clients/cli/connections.c:4732
+#, fuzzy, c-format
+msgid "Error: '%s' argument is required."
+msgstr "エラー: 'タイプ' 引数が必要です。"
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:5701
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
@@ -2715,7 +2326,7 @@ msgstr "['%s' 設定値]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8117
+#: ../clients/cli/connections.c:5783
 #, fuzzy, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2748,7 +2359,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了する\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:5810
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2767,7 +2378,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:5817
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2788,7 +2399,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:5824
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2803,7 +2414,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:5829
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2816,7 +2427,7 @@ msgstr ""
 "プロパティ詳細を表示します。NM の設定およびプロパティの全詳細については nm-"
 "settings(5) の man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:5834
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2831,7 +2442,7 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:5839
 #, fuzzy, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2853,7 +2464,7 @@ msgstr ""
 "例: nmcli> verify\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:5848
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2869,7 +2480,7 @@ msgid ""
 "profile must be deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:5859
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2890,7 +2501,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
 "は / を先頭に付ける)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:5866 ../clients/cli/connections.c:6025
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -2899,7 +2510,7 @@ msgstr ""
 "back  :: 一つ上のメニューレベルに移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:5869
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -2908,7 +2519,7 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:5872
 #, fuzzy, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2934,7 +2545,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2947,8 +2558,8 @@ msgstr ""
 "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
 "求められます。\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:5899 ../clients/cli/connections.c:6036
+#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "不明なコマンド: '%s'\n"
@@ -2956,7 +2567,7 @@ msgstr "不明なコマンド: '%s'\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8299
+#: ../clients/cli/connections.c:5965
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2982,7 +2593,7 @@ msgstr ""
 "help/?   [<command>]             :: このヘルプまたはコマンドの詳細を表示\n"
 "quit                             :: nmcli の終了\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:5990
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2993,7 +2604,7 @@ msgstr ""
 "\n"
 "このプロパティに指定した <value> を設定します。\n"
 
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:5994
 #, fuzzy, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3007,7 +2618,7 @@ msgstr ""
 "このプロパティのタイプがコンテナーの場合、指定した <value> を追加します。単一"
 "値のプロパティの場合はその値が置換されます ('set' と同じ)。\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:6000
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3018,7 +2629,7 @@ msgstr ""
 "\n"
 "現在の値を表示し、その値を変更することができます。\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:6004
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3038,7 +2649,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:6015
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3051,7 +2662,7 @@ msgstr ""
 "プロパティの詳細を表示します。NM 設定とプロパティの全詳細は nm-settings(5) "
 "man ページを参照してください。\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:6020
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3065,7 +2676,7 @@ msgstr ""
 "プロパティ値を表示します。引数を指定すると、設定または接続全体の値を表示させ"
 "ることもできます。\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:6028
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -3074,28 +2685,23 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンドのヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "エラー: 接続のアクティベートに失敗しました。\n"
-
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:6209
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "エラー: 設定 '%s' は必須のため削除できません。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
+#: ../clients/cli/connections.c:6227
 #, fuzzy, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ 接続タイプ: %s | name: %s | UUID: %s | dirty: %s ]\n"
 
-#: ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:6263
 #, fuzzy, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "この接続は保存されません。本当に終了してよいですか? [y/n]\n"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:6312
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3104,66 +2710,66 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
 "で「save」と入力すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6758
+#: ../clients/cli/connections.c:6816
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティに対して許可されている値: %s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
+#: ../clients/cli/connections.c:6820
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力してください: "
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
+#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:6372
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値の編集: "
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:6401
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
+#: ../clients/cli/connections.c:6955
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:6428
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明なコマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:6533
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用可能な設定: %s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:6545
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効な設定名; %s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:6562
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "使用可能なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:6570
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティ %s\n"
 
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:6611
 #, fuzzy, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3174,12 +2780,12 @@ msgstr ""
 "ベートされる可能性があります。\n"
 "本当に保存しますか? [yes] "
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:6700
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次の設定を変更することができます: %s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:6728
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3188,442 +2794,457 @@ msgstr ""
 "この接続プロファイルは別のクライアントからは削除されています。「save」と入力"
 "すると元に戻すことができます。\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:6770 ../clients/cli/connections.c:7000
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定が選択されていません; 有効な設定は [%s] になります\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:6771
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
 "ください。\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
+#: ../clients/cli/connections.c:7022
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効な設定引数 %s です; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:6795
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティ用の設定がありません\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:6802
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:6855
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:6868
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更できるのは次のプロパティになります: %s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:6912
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数が指定されていません; [%s] が有効な引数になります\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:6931
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:6976
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティ、設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:7001
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
 "用してください\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:7050
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:7082
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: 不明な設定: '%s'\n"
 
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:7087
 #, fuzzy, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:7115
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効なプロパティ: %s%s\n"
 
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:7117
 #, fuzzy
 msgid ", neither a valid setting name"
 msgstr "エラー: 無効なプロパティ: %s、有効な設定名でもありません。\n"
 
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:7134
 #, fuzzy, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効なオプション '%s'"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:7142
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' の確認: %s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:7157
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:7160
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:7177
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効な引数 '%s'\n"
 
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:7210
 #, fuzzy, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: (%d) %s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:7217
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) が正常に保存されました。\n"
 
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:7218
 #, fuzzy, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) が正常に追加されました。\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:7251
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続の確認に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:7252
 msgid "(unknown error)"
 msgstr "(不明なエラー)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:7253
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:7275
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:7279
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:7289
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベートできません: %s。\n"
 
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:7299
 #, fuzzy, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: (%d) %s\n"
 
-#: ../clients/cli/connections.c:9640
+#: ../clients/cli/connections.c:7305
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:7343
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:7351
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:7359
 #, fuzzy, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: 'show active': %s"
 
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:7368
 #, fuzzy, c-format
 msgid "Error: bad color: %s\n"
 msgstr "エラー: 無効なプロパティ: %s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:7382
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:7392
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効な設定オプション '%s'; [%s] が許可されています\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:7593
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
+#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
+#: ../clients/cli/connections.c:8434
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: 不明な接続 '%s' です。"
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:7623
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています;  'タイプ' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:7626
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告: 既存の接続 '%s' を編集しています; 'con 名' 引数は無視されます\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:7640
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効な接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:7642
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効な接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:7681
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:7684
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存の '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:7686
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新規の '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:7688
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:7690
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "プロパティ詳細を表示するには 'describe [<setting>.<prop>]' を入力します。"
 
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:7728
 #, fuzzy, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' の変更に失敗しました: (%d) %s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:7735
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) が正常に変更されました。\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
+#.
+#. * TODO(?) complete "uuid", "path", "id" or connection name.
+#. * (if we ever will move this here from shell completion script)
+#. if (nmc->complete) {
+#. quit ();
+#.
+#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
+#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数がありません。"
 
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "エラー: 接続 ID がありません。"
-
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:7847
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:7883
 #, fuzzy
 msgid "New connection name: "
 msgstr "新規の接続"
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数がありません。"
 
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:7910
 #, fuzzy, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
+#, c-format
+msgid "Error: connection ID is missing."
+msgstr "エラー: 接続 ID がありません。"
+
+#: ../clients/cli/connections.c:7979
 #, fuzzy, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:7980
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続の削除に失敗しました: %s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "エラー: 不明な接続 '%s'\n"
 
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:8060
 #, c-format
 msgid "Error: no connection provided."
 msgstr "エラー: 接続がありません。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:8085
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: 不明な接続を削除できません: %s。"
 
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:8097
 #, fuzzy, c-format
 msgid "%s: connection profile changed\n"
 msgstr "接続に失敗"
 
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:8123
 #, fuzzy, c-format
 msgid "%s: connection profile created\n"
 msgstr "接続に失敗"
 
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:8132
 #, fuzzy, c-format
 msgid "%s: connection profile removed\n"
 msgstr "接続は削除されました"
 
-#: ../clients/cli/connections.c:10548
+#: ../clients/cli/connections.c:8180
 #, fuzzy, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
 
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:8205
 #, fuzzy, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
 
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:8239
 #, fuzzy, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:8247
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:8256
 #, fuzzy
 msgid "File to import: "
 msgstr "暗号化に失敗しました: %d"
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:8296
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:8307
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:8309
 #, fuzzy, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明なパラメーター: %s\n"
 
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:8319
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "エラー: 'タイプ' 引数が必要です。"
+
+#: ../clients/cli/connections.c:8324
 #, fuzzy, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 「ifname」引数を入力してください。"
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:8331
+#, fuzzy, c-format
+msgid "Error: failed to find VPN plugin for %s."
+msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+
+#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
 #, fuzzy, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:8347
 #, fuzzy, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:8397
 #, fuzzy
 msgid "Output file name: "
 msgstr "ファイル名"
 
-#: ../clients/cli/connections.c:10769
+#: ../clients/cli/connections.c:8421
 #, fuzzy, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:8441
 #, fuzzy, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:8462
 #, fuzzy, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "一時ファイルを作成できませんでした: %s"
 
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:8471
 #, fuzzy, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' プロパティの設定に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:8482
 #, fuzzy, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
 
-#: ../clients/cli/connections.c:10976
+#: ../clients/cli/connections.c:8628
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:11002
+#: ../clients/cli/connections.c:8654
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:11089
+#: ../clients/cli/connections.c:8740
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数がありません"
 
-#: ../clients/cli/connections.c:11154
+#: ../clients/cli/connections.c:8816
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "エラー: '%s' は有効な '接続' コマンドではありません。"
@@ -3770,7 +3391,7 @@ msgid "S390-SUBCHANNELS"
 msgstr ""
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
 msgid "WEP"
 msgstr "WEP"
 
@@ -3780,7 +3401,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3796,7 +3417,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
 msgid "AP"
 msgstr "AP"
 
@@ -3840,11 +3461,6 @@ msgstr "TX-POW"
 msgid "BSID"
 msgstr "BSID"
 
-#. 0
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
-
 #. 1
 #: ../clients/cli/devices.c:152
 msgid "SSID-HEX"
@@ -3908,143 +3524,156 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192
+#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
 msgid "SLAVES"
 msgstr "スレーブ"
 
+#. 1
+#: ../clients/cli/devices.c:202
+msgid "CONFIG"
+msgstr ""
+
 #. 0
-#: ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:211
 msgid "PARENT"
 msgstr ""
 
 #. 1
-#: ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:212
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
+#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../clients/cli/devices.c:227
+#: ../clients/cli/devices.c:237
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 3
-#: ../clients/cli/devices.c:229
+#: ../clients/cli/devices.c:239
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../clients/cli/devices.c:230
+#: ../clients/cli/devices.c:240
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-プロパティ"
 
 #. 10
-#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "ボンド"
 
 #. 11
-#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "team"
 
 #. 12
-#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "ブリッジ"
 
+#. 13
+#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
+#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
+#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
+#: ../libnm/nm-device.c:1830
+msgid "VLAN"
+msgstr "VLAN"
+
 #. 14
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:250
 msgid "BLUETOOTH"
 msgstr "BLUETOOTH"
 
 #. 15
-#: ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:251
 msgid "CONNECTIONS"
 msgstr "接続"
 
 #. 1
-#: ../clients/cli/devices.c:253
+#: ../clients/cli/devices.c:263
 msgid "CHASSIS-ID"
 msgstr ""
 
 #. 2
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:264
 msgid "PORT-ID"
 msgstr ""
 
 #. 3
-#: ../clients/cli/devices.c:255
+#: ../clients/cli/devices.c:265
 msgid "PORT-DESCRIPTION"
 msgstr ""
 
 #. 4
-#: ../clients/cli/devices.c:256
+#: ../clients/cli/devices.c:266
 #, fuzzy
 msgid "SYSTEM-NAME"
 msgstr "ユーザー名"
 
 #. 5
-#: ../clients/cli/devices.c:257
+#: ../clients/cli/devices.c:267
 msgid "SYSTEM-DESCRIPTION"
 msgstr ""
 
 #. 6
-#: ../clients/cli/devices.c:258
+#: ../clients/cli/devices.c:268
 #, fuzzy
 msgid "SYSTEM-CAPABILITIES"
 msgstr "能力"
 
 #. 7
-#: ../clients/cli/devices.c:259
+#: ../clients/cli/devices.c:269
 msgid "IEEE-802-1-PVID"
 msgstr ""
 
 #. 8
-#: ../clients/cli/devices.c:260
+#: ../clients/cli/devices.c:270
 msgid "IEEE-802-1-PPVID"
 msgstr ""
 
 #. 9
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:271
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr ""
 
 #. 10
-#: ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:272
 msgid "IEEE-802-1-VID"
 msgstr ""
 
 #. 11
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:273
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr ""
 
 #. 12
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:274
 msgid "DESTINATION"
 msgstr ""
 
 #. 13
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:275
 msgid "CHASSIS-ID-TYPE"
 msgstr ""
 
 #. 14
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:276
 msgid "PORT-ID-TYPE"
 msgstr ""
 
-#: ../clients/cli/devices.c:283
+#: ../clients/cli/devices.c:293
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -4060,7 +3689,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname> ...\n"
+"  reapply <ifname>\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4108,7 +3737,7 @@ msgstr ""
 "  wimax [list [ifname <ifname>] [nsp <名前>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:305
+#: ../clients/cli/devices.c:315
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -4139,7 +3768,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/devices.c:320
+#: ../clients/cli/devices.c:330
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -4158,7 +3787,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:331
+#: ../clients/cli/devices.c:341
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -4180,12 +3809,12 @@ msgstr ""
 "auto-connect に設定されていない接続についても考慮されます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:343
+#: ../clients/cli/devices.c:353
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4200,7 +3829,7 @@ msgstr ""
 "行わずとも自動アクティベートによる接続が行われないようにします。\n"
 "\n"
 
-#: ../clients/cli/devices.c:354
+#: ../clients/cli/devices.c:364
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4221,7 +3850,7 @@ msgstr ""
 "行わずとも自動アクティベートによる接続が行われないようにします。\n"
 "\n"
 
-#: ../clients/cli/devices.c:366
+#: ../clients/cli/devices.c:376
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4242,7 +3871,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:379
+#: ../clients/cli/devices.c:389
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4256,7 +3885,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:392
+#: ../clients/cli/devices.c:402
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4276,7 +3905,7 @@ msgstr ""
 "このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:404
+#: ../clients/cli/devices.c:414
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -4371,7 +4000,7 @@ msgstr ""
 "ます。\n"
 "\n"
 
-#: ../clients/cli/devices.c:451
+#: ../clients/cli/devices.c:461
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -4395,300 +4024,305 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
+#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
+#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェースが指定されていません。"
 
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:557
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:559
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デバイス'%s' が見つかりません。\n"
 
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:560
 #, fuzzy, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
+#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../clients/cli/devices.c:719
+#: ../clients/cli/devices.c:729
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:720
+#: ../clients/cli/devices.c:730
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:735
+#: ../clients/cli/devices.c:745
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:754
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:760
+#: ../clients/cli/devices.c:770
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:761
+#: ../clients/cli/devices.c:771
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:762
+#: ../clients/cli/devices.c:772
 msgid "N/A"
 msgstr "なし"
 
-#: ../clients/cli/devices.c:916
+#: ../clients/cli/devices.c:996
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../clients/cli/devices.c:928
+#: ../clients/cli/devices.c:1008
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1104
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1195
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1195
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/devices.c:1342
+#: ../clients/cli/devices.c:1422
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1349
+#: ../clients/cli/devices.c:1429
 msgid "Status of devices"
 msgstr "デバイスの状態"
 
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
+#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
+#: ../clients/cli/devices.c:3609
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../clients/cli/devices.c:1475
+#: ../clients/cli/devices.c:1555
 #, fuzzy, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "成功: デバイス '%s' は正常にアクティベートされました。"
 
-#: ../clients/cli/devices.c:1481
+#: ../clients/cli/devices.c:1561
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1517
+#: ../clients/cli/devices.c:1597
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1520
+#: ../clients/cli/devices.c:1600
 #, fuzzy, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: (%d) %s"
 
-#: ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:1610
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
 
-#: ../clients/cli/devices.c:1532
+#: ../clients/cli/devices.c:1612
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
 
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1624
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
 "UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1547
+#: ../clients/cli/devices.c:1627
 #, fuzzy, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr ""
 "UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
 
-#: ../clients/cli/devices.c:1611
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1620
+#: ../clients/cli/devices.c:1700
 #, fuzzy, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
 
-#: ../clients/cli/devices.c:1635
+#: ../clients/cli/devices.c:1715
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "デバイス '%s'  は接続されています。\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1771
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加の引数は許可されていません: '%s'。"
 
-#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
+#: ../clients/cli/devices.c:2022
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デバイス '%s' が正常に切断されました。\n"
 
-#: ../clients/cli/devices.c:1779
+#: ../clients/cli/devices.c:1859
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デバイス '%s' が正常に削除されました。\n"
 
-#: ../clients/cli/devices.c:1838
+#: ../clients/cli/devices.c:1918
 #, fuzzy, c-format
-msgid "Error: not all connections reapplied."
-msgstr "エラー: 接続が指定されていません。"
-
-#: ../clients/cli/devices.c:1839
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
 
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1928
 #, fuzzy, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/devices.c:1912
+#: ../clients/cli/devices.c:1965
 #, fuzzy, c-format
-msgid "Error: no valid device provided."
-msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+msgid "Error: unsupported argument '%s'."
+msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:1979
+#, fuzzy, c-format
+msgid "Error: device '%s' not found."
+msgstr "エラー: デバイス'%s' が見つかりません"
+
+#: ../clients/cli/devices.c:2007
 #, fuzzy, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:2008
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
 
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2083
 #, fuzzy, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2084
 #, fuzzy, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
 
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2190
 #, fuzzy, c-format
 msgid "Error: No property specified."
 msgstr "エラー: 接続が指定されていません。"
 
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数がありません。"
 
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2207
 #, fuzzy, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'モード': %s。"
 
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2222
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "エラー: '自動接続': %s。"
+
+#: ../clients/cli/devices.c:2232
 #, fuzzy, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2278
 #, fuzzy, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "そのような接続 '%s' はありません"
 
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2304
 #, c-format
 msgid "%s: device created\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2311
 #, fuzzy, c-format
 msgid "%s: device removed\n"
 msgstr "このデバイスは削除されました"
 
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2397
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2435
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2504
 #, fuzzy, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2508 ../clients/cli/devices.c:2841
+#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2721
 msgid "SSID or BSSID: "
 msgstr "SSID または BSSID: "
 
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2726
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID または BSSID がありません。"
 
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2750
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2774
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4696,208 +4330,208 @@ msgstr ""
 "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
 "てください。"
 
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2794 ../clients/cli/devices.c:2807
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2822
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
 
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2828
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
 
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
+#: ../clients/cli/devices.c:3412
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:2863
 #, fuzzy, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: %s.%s の変更に失敗しました: %s。"
 
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:2888
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:2890
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
 
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:2932
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:2946
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3095
 #, fuzzy, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3112
 #, fuzzy, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3128
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3186
 #, fuzzy, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: 'ssid' が必要です。"
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3198
 #, fuzzy, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
 "てください。"
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3222
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: 不明なパラメータ %s です。"
 
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3241
 #, fuzzy, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: 'apn' が必要です。"
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3247
 #, fuzzy, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
 
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3275
 #, fuzzy, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
 
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3310
 #, fuzzy, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効なプロパティ '%s': %s。"
 
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3379
 #, fuzzy, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' 設定はありません\n"
 
-#: ../clients/cli/devices.c:3399
+#: ../clients/cli/devices.c:3460
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3486
 msgid "Device LLDP neighbors"
 msgstr ""
 
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3589
 #, fuzzy, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device status': %s"
 
-#: ../clients/cli/devices.c:3575
+#: ../clients/cli/devices.c:3636
 #, fuzzy, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3825
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:34
+#: ../clients/cli/general.c:35
 msgid "RUNNING"
 msgstr "実行中"
 
 #. 0
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:36
 msgid "VERSION"
 msgstr "バージョン"
 
 #. 2
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:38
 msgid "STARTUP"
 msgstr "スタートアップ"
 
 #. 3
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:39
 msgid "CONNECTIVITY"
 msgstr "接続性"
 
 #. 4
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:40
 msgid "NETWORKING"
 msgstr "ネットワーキング"
 
 #. 5
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:41
 msgid "WIFI-HW"
 msgstr "WIFI ハードウェア"
 
 #. 6
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
 #. 7
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:43
 msgid "WWAN-HW"
 msgstr "WWAN ハードウェア"
 
 #. 8
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:45
 msgid "WIMAX-HW"
 msgstr "WIMAX ハードウェア"
 
 #. 10
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:46
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:61
+#: ../clients/cli/general.c:62
 msgid "PERMISSION"
 msgstr "パーミッション"
 
 #. 0
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:63
 msgid "VALUE"
 msgstr "値"
 
-#: ../clients/cli/general.c:70
+#: ../clients/cli/general.c:71
 msgid "LEVEL"
 msgstr "レベル"
 
 #. 0
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:72
 msgid "DOMAINS"
 msgstr "ドメイン"
 
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:86
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4926,7 +4560,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:96
+#: ../clients/cli/general.c:97
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4943,7 +4577,7 @@ msgstr ""
 "status' を実行したことになります。\n"
 "\n"
 
-#: ../clients/cli/general.c:105
+#: ../clients/cli/general.c:106
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4966,7 +4600,7 @@ msgstr ""
 "渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
 "\n"
 
-#: ../clients/cli/general.c:117
+#: ../clients/cli/general.c:118
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4979,7 +4613,7 @@ msgstr ""
 "認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
 "\n"
 
-#: ../clients/cli/general.c:125
+#: ../clients/cli/general.c:126
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -5004,7 +4638,7 @@ msgstr ""
 "使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
 "\n"
 
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:139
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -5029,7 +4663,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:148
+#: ../clients/cli/general.c:149
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -5042,7 +4676,7 @@ msgstr ""
 "ネットワークをオンに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:156
+#: ../clients/cli/general.c:157
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -5055,7 +4689,7 @@ msgstr ""
 "ネットワークをオフに切り替えます。\n"
 "\n"
 
-#: ../clients/cli/general.c:164
+#: ../clients/cli/general.c:165
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -5074,7 +4708,7 @@ msgstr ""
 "ネットワークの接続状態を取得します。\n"
 "オプションの 'check' 引数を付けると接続を再チェックします。\n"
 
-#: ../clients/cli/general.c:176
+#: ../clients/cli/general.c:177
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -5095,7 +4729,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:185
+#: ../clients/cli/general.c:186
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -5112,7 +4746,7 @@ msgstr ""
 "すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:195
+#: ../clients/cli/general.c:196
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -5129,7 +4763,7 @@ msgstr ""
 "Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
 "\n"
 
-#: ../clients/cli/general.c:205
+#: ../clients/cli/general.c:206
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -5147,7 +4781,7 @@ msgstr ""
 "す。\n"
 "\n"
 
-#: ../clients/cli/general.c:215
+#: ../clients/cli/general.c:216
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -5157,198 +4791,198 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:233
+#: ../clients/cli/general.c:234
 msgid "asleep"
 msgstr "休止中"
 
-#: ../clients/cli/general.c:235
+#: ../clients/cli/general.c:236
 msgid "connecting"
 msgstr "接続中"
 
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:238
 msgid "connected (local only)"
 msgstr "接続完了 (ローカルのみ)"
 
-#: ../clients/cli/general.c:239
+#: ../clients/cli/general.c:240
 msgid "connected (site only)"
 msgstr "接続完了 (サイトのみ)"
 
-#: ../clients/cli/general.c:243
+#: ../clients/cli/general.c:244
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:279
+#: ../clients/cli/general.c:280
 msgid "portal"
 msgstr "ポータル"
 
-#: ../clients/cli/general.c:281
+#: ../clients/cli/general.c:282
 msgid "limited"
 msgstr "制限付き"
 
-#: ../clients/cli/general.c:283
+#: ../clients/cli/general.c:284
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:334
+#: ../clients/cli/general.c:335
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 許可されているのは次のフィールドのみです: %s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:358
 msgid "NetworkManager status"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:363
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:366
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:366
 msgid "started"
 msgstr "起動しました"
 
+#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:372
 msgid "enabled"
 msgstr "有効"
 
+#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:372
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:435
 msgid "auth"
 msgstr "認証"
 
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:464
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:478
 msgid "NetworkManager permissions"
 msgstr "NetworkManager のパーミッション"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:519
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:534
 msgid "NetworkManager logging"
 msgstr "NetworkManager のロギング"
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:556
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト名の設定に失敗しました: %s"
 
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:669
 #, fuzzy, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギング設定のアクセスが拒否されました; %s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:678
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "エラー: 'general' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:696
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "エラー: '--fields' の値 '%s' はここでは無効です (許可フィールド: %s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:721
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
 
-#: ../clients/cli/general.c:743
+#: ../clients/cli/general.c:732
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:758
+#: ../clients/cli/general.c:747
 msgid "Networking"
 msgstr "ネットワーキング"
 
-#: ../clients/cli/general.c:783
+#: ../clients/cli/general.c:772
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr ""
 "エラー: 'networking connectivity' のコマンド '%s' は有効なコマンドではありま"
 "せん。"
 
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:788
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "エラー: 'networking' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
 msgid "Radio switches"
 msgstr "ラジオスイッチ"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:855
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッチ"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:871
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッチ"
 
-#: ../clients/cli/general.c:893
+#: ../clients/cli/general.c:882
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:902
 #, fuzzy
 msgid "NetworkManager has started"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:902
 #, fuzzy
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager のステータス"
 
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:913
 #, fuzzy, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト名を '%s' に設定します"
 
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:928
 #, fuzzy, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:930
 #, fuzzy, c-format
 msgid "There's no primary connection\n"
 msgstr "接続の確認: %s\n"
 
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:942
 #, fuzzy, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:955
 #, fuzzy, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager が実行していません。"
 
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:966
 #, fuzzy, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:980
 #, fuzzy
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager が実行していません。"
@@ -5408,65 +5042,65 @@ msgstr ""
 "  d[evice]        NetworkManager で管理しているデバイス\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:143
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr ""
 "エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:183
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:188
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:196
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:201
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
+#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
+#: ../clients/cli/nmcli.c:254
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:261
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:281
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "エラー: '%s' は '%s' オプションの有効なタイムアウトではありません。"
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:288
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:294
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5475,22 +5109,22 @@ msgstr ""
 "\n"
 "エラー: 信号 %d により nmcli が終了しました。"
 
-#: ../clients/cli/nmcli.c:408
+#: ../clients/cli/nmcli.c:418
 #, fuzzy, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "信号マスクの設定に失敗しました: %d"
 
-#: ../clients/cli/nmcli.c:415
+#: ../clients/cli/nmcli.c:425
 #, fuzzy, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "信号処理スレッドの作成に失敗しました: %d"
 
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
 #, fuzzy, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
 
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:539
 msgid "Success"
 msgstr "成功"
 
@@ -5509,251 +5143,258 @@ msgstr "認証エラー: %s\n"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "モデムの初期化に失敗しました"
 
-#: ../clients/cli/settings.c:790
+#: ../clients/cli/settings.c:796
 #, fuzzy, c-format
 msgid "%d (key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../clients/cli/settings.c:792
+#: ../clients/cli/settings.c:798
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:824
+#: ../clients/cli/settings.c:830
 msgid "0 (NONE)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:836
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダーの順序変更、"
 
-#: ../clients/cli/settings.c:832
+#: ../clients/cli/settings.c:838
 msgid "GVRP, "
 msgstr "GVRP、"
 
-#: ../clients/cli/settings.c:834
+#: ../clients/cli/settings.c:840
 msgid "LOOSE_BINDING, "
 msgstr "結合を緩める、"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:842
 #, fuzzy
 msgid "MVRP, "
 msgstr "GVRP、"
 
-#: ../clients/cli/settings.c:875
+#: ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (無効)"
 
-#: ../clients/cli/settings.c:877
+#: ../clients/cli/settings.c:883
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (有効、パブリック IP 優先)"
 
-#: ../clients/cli/settings.c:879
+#: ../clients/cli/settings.c:885
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (有効、テンポラリ IP を優先)"
 
-#: ../clients/cli/settings.c:894
+#: ../clients/cli/settings.c:900
 #, fuzzy, c-format
 msgid "%d (no)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:896
+#: ../clients/cli/settings.c:902
 #, c-format
 msgid "%d (yes)"
 msgstr ""
 
-#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
 #, fuzzy, c-format
 msgid "%d (default)"
 msgstr "(デフォルト)"
 
-#: ../clients/cli/settings.c:912
+#: ../clients/cli/settings.c:918
 msgid "0 (none)"
 msgstr "0 (なし)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:924
 msgid "agent-owned, "
 msgstr "エージェント所有、 "
 
-#: ../clients/cli/settings.c:920
+#: ../clients/cli/settings.c:926
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/cli/settings.c:922
+#: ../clients/cli/settings.c:928
 msgid "not required, "
 msgstr "不必要、 "
 
-#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: ../clients/cli/settings.c:1252
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
+#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
+#: ../clients/cli/settings.c:8033
+msgid "<hidden>"
+msgstr ""
+
+#: ../clients/cli/settings.c:1302
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/cli/settings.c:1258
+#: ../clients/cli/settings.c:1308
 msgid "enabled, "
 msgstr "有効、"
 
-#: ../clients/cli/settings.c:1260
+#: ../clients/cli/settings.c:1310
 msgid "advertise, "
 msgstr "公表、"
 
-#: ../clients/cli/settings.c:1262
+#: ../clients/cli/settings.c:1312
 msgid "willing, "
 msgstr "用意がある、"
 
-#: ../clients/cli/settings.c:1290
+#: ../clients/cli/settings.c:1340
 msgid "-1 (unset)"
 msgstr "-1 (未設定)"
 
-#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
-#: ../clients/cli/settings.c:1864
+#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
+#: ../clients/cli/settings.c:1917
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
+#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/cli/settings.c:1556
+#: ../clients/cli/settings.c:1607
 #, fuzzy, c-format
 msgid "%d (off)"
 msgstr "%d (不明)"
 
-#: ../clients/cli/settings.c:1770
+#: ../clients/cli/settings.c:1823
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
 
-#: ../clients/cli/settings.c:1781
+#: ../clients/cli/settings.c:1834
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr ""
 
-#: ../clients/cli/settings.c:1817
+#: ../clients/cli/settings.c:1870
 #, fuzzy, c-format
 msgid "invalid mode '%s', use one of %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/settings.c:1899
+#: ../clients/cli/settings.c:1952
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
+#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
+#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, fuzzy, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効なオプション '%s'、またはその値 '%s' です"
 
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2162
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "'%s' を '%s' に設定しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2164
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s' も消去しますか? [yes]: "
 
-#: ../clients/cli/settings.c:2279
+#: ../clients/cli/settings.c:2325
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2344
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2346
 #, fuzzy
 msgid "Do you want to remove them? [yes] "
 msgstr "指定しますか? (yes/no) [yes] "
 
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
+#: ../clients/cli/settings.c:5294
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' は無効です"
 
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2505
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2527
 #, fuzzy, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "'%d' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2549
 #, fuzzy, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "'%u' は無効です; <%d-%d> を使用してください"
 
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2588
 #, fuzzy, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2655
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' は無効です; <option>=<value> を使用してください"
 
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2689
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "インデックス '%s' は無効です"
 
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
 msgid "no item to remove"
 msgstr "削除するアイテムがありません"
 
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "インデックス '%d' は範囲内にありません <0-%d>"
 
-#: ../clients/cli/settings.c:2652
+#: ../clients/cli/settings.c:2738
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無効なオプション '%s'"
 
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2740
 msgid "missing option"
 msgstr "足りないオプション"
 
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
+#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
 
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:2861
 #, fuzzy, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
 
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:2893
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' は有効な Ethernet MAC ではありません"
 
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5761,38 +5402,50 @@ msgstr "'%s' は有効な Ethernet MAC ではありません"
 msgid "'%s' is not a valid interface name"
 msgstr "'%s' は有効なインターフェース名ではありません"
 
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:2942
 #, fuzzy, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
 
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:2954
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:2995
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' は有効な 16 進文字ではありません"
 
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:3025
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' は有効な MAC ではありません"
 
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#. Don't allow setting type unless the connection is brand new.
+#. * Just because it's a bad idea and the user wouldn't probably want that.
+#. * No technical reason, really.
+#. * Also, using uuid to see if the connection is brand new is a bit
+#. * hacky: we can not see if the type is already set, because
+#. * nmc_setting_set_property() is called only after the property
+#. * we're setting (type) has been removed.
+#: ../clients/cli/settings.c:3053
+#, fuzzy, c-format
+msgid "Can not change the connection type"
+msgstr "接続タイプを入力してください: "
+
+#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' は有効な UUID ではありません"
 
-#: ../clients/cli/settings.c:3032
+#: ../clients/cli/settings.c:3144
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3156
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5807,38 +5460,38 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3175
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "'%s' は 有効なマスターではありません: ifname か接続 UUID を使用してください。"
 
-#: ../clients/cli/settings.c:3107
+#: ../clients/cli/settings.c:3219
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
 #, fuzzy, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "エラー: '%s' は無効な接続タイプです。"
 
-#: ../clients/cli/settings.c:3120
+#: ../clients/cli/settings.c:3232
 #, fuzzy, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' は有効な team 設定でもファイル名でもありません"
 
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3266
 #, fuzzy, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "'%s' は有効な UUID ではありません"
 
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3273
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3285
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5851,7 +5504,7 @@ msgid ""
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3240
+#: ../clients/cli/settings.c:3352
 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"
@@ -5860,16 +5513,16 @@ msgid ""
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3364
+#: ../clients/cli/settings.c:3476
 msgid "private key password not provided"
 msgstr "プライベートキーのパスワードが入力されていません"
 
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3504
 #, fuzzy, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3521
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5877,12 +5530,12 @@ msgid ""
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3540
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3556
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5890,7 +5543,7 @@ msgid ""
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3568
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5900,12 +5553,12 @@ msgid ""
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3588
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3604
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5915,7 +5568,7 @@ msgid ""
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3624
 #, fuzzy
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
@@ -5928,7 +5581,7 @@ msgstr ""
 "  <file path> [<password>]\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3695
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5949,7 +5602,7 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:3816
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5980,32 +5633,32 @@ msgstr ""
 "\n"
 "例: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:3847
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' は有効な InfiniBand MAC ではありません"
 
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:3884
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' は有効な IBoIP P_Key ではありません"
 
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:3915
 #, fuzzy, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "'%s' は無効です (ip/[prefix] next-hop [metric] を使用してください)"
 
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:3963 ../clients/cli/settings.c:3982
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:4000
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6015,22 +5668,22 @@ msgstr ""
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:4036 ../clients/cli/settings.c:4350
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4141
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
@@ -6045,17 +5698,17 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
 #, fuzzy, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効なゲートウェイ '%s'"
 
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
 #, fuzzy, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4225
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
@@ -6075,12 +5728,12 @@ msgstr ""
 "\n"
 "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 
-#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4271 ../clients/cli/settings.c:4290
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4308
 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 "
@@ -6099,7 +5752,7 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4454
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
@@ -6115,7 +5768,7 @@ msgstr ""
 "例: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
 "1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4538
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
@@ -6137,28 +5790,28 @@ msgstr ""
 "例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
 "beef::3 2\n"
 
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4555 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' は数字ではありません"
 
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4562
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' は無効です; 0、1、2 のいずれかを使用してください。"
 
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4609
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' は有効なチャンネルではありません; <1-13> を使用してください"
 
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4646
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' は無効です; [e, o, n] を使用してください"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4674
 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 "
@@ -6176,32 +5829,32 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4714
 msgid "no priority to remove"
 msgstr "削除する優先度がありません"
 
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4718
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4757
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4764
 #, fuzzy, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:4812
 #, fuzzy, c-format
 msgid "'%s' cannot be empty"
 msgstr "'%s' オプションが空白です"
 
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
 #: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
 #: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
 #: ../libnm-util/nm-setting-wireless.c:859
@@ -6210,17 +5863,17 @@ msgstr "'%s' オプションが空白です"
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' は有効な MAC アドレスではありません"
 
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4892 ../clients/cli/settings.c:5059
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:4911
 #, fuzzy, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' は無効です; 3 つの文字列を入力してください"
 
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:4925
 #, fuzzy
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
@@ -6232,12 +5885,12 @@ msgstr ""
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:4947
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr ""
 
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:4979
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6248,58 +5901,58 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次が有効なオプションになります: %s\n"
 
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:5025
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:5031
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' は有効なチャンネルではありません"
 
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5125
 #, fuzzy, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "無効なオプション '%s'、またはその値 '%s' です"
 
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
+#: ../clients/cli/settings.c:5264
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5303
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
 
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5311
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP キーは '%s' であると仮定しています\n"
 
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5313
 #, fuzzy, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "WEP キーは '%s' であると仮定しています\n"
 
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5336
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' は [0 (unknown), 1 (key), 2 (passphrase)] にはありません"
 
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
+#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5374
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6308,36 +5961,36 @@ msgstr ""
 "WEP キーのタイプを入力します。使用できる値は、0 または unknown、1 または "
 "key、2 または passphrase です。\n"
 
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5387
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' は有効な PSK ではありません"
 
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5431
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' は有効な DCB フラグではありません"
 
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5454
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' は DCB アプリケーションの優先度ではありません"
 
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5480
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマで区切った 8 つの番号を含ませてください"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5497
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
 
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5500
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
 
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5522
 #, c-format
 msgid ""
 "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
@@ -6346,51 +5999,41 @@ msgstr ""
 "警告: 変更は '%s' に 1 (有効) を含ませるまで効果はありません\n"
 "\n"
 
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5575
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5710
 #, fuzzy, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "無効なオプション '%s'、またはその値 '%s' です"
 
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:7777
 msgid "don't know how to get the property value"
 msgstr "プロパティ値の取得方法がわかりません"
 
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
 msgid "the property can't be changed"
 msgstr "このプロパティは変更できません"
 
-#: ../clients/cli/settings.c:7821
+#: ../clients/cli/settings.c:7954
 #, fuzzy
 msgid "(not available)"
 msgstr "利用不可"
 
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:7979
 msgid "[NM property description]"
 msgstr "[NM プロパティの詳細]"
 
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:7984
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有の詳細]"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/utils.c:124
-#, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "エラー: '%s' 引数の値が必要です。"
-
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6402,59 +6045,49 @@ msgstr ""
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期しない引数 '%s' です"
 
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "IP4 アドレス 0x%X をテキスト形式に変換中にエラーが発生しました"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "IP6 アドレス '%s' をテキスト形式に変換中にエラーが発生しました"
-
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
 #, fuzzy, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:502
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:535
 #, fuzzy, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' は無効です; [%s] か [%s] を使用してください"
 
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:634
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' が不明瞭です (%s x %s)"
 
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:646
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
 
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:893
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' は孤立する必要があります"
 
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:896
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:953
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "オプション '--terse' には '--fields' の指定が必要です"
 
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:957
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
@@ -6465,16 +6098,6 @@ msgstr ""
 msgid "An authentication session is already underway."
 msgstr ""
 
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "ユーザー名"
-
 #: ../clients/common/nm-secret-agent-simple.c:230
 #: ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:303
@@ -6482,9 +6105,10 @@ msgstr "ユーザー名"
 #: ../clients/common/nm-secret-agent-simple.c:492
 #: ../clients/common/nm-secret-agent-simple.c:507
 #: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:101
-#: ../clients/common/nm-vpn-helpers.c:102
-#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:119
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:124
+#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6564,26 +6188,53 @@ msgstr "'%s' への接続にはパスワードが必要です。"
 msgid "VPN password required"
 msgstr "PIN コードが必要です"
 
-#: ../clients/common/nm-vpn-helpers.c:61
-msgid "could not get VPN plugin info"
+#: ../clients/common/nm-vpn-helpers.c:48
+#, fuzzy, c-format
+msgid "unknown VPN plugin \"%s\""
+msgstr "不明なログドメイン '%s'"
+
+#: ../clients/common/nm-vpn-helpers.c:59
+#, c-format
+msgid "cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""
+msgstr ""
+
+#: ../clients/common/nm-vpn-helpers.c:64
+#, c-format
+msgid ""
+"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
 msgstr ""
 
-#: ../clients/common/nm-vpn-helpers.c:103
-#: ../clients/common/nm-vpn-helpers.c:106
+#: ../clients/common/nm-vpn-helpers.c:69
+#, fuzzy, c-format
+msgid "failed to load VPN plugin \"%s\": %s"
+msgstr "エラー: %s.%s の変更に失敗しました: %s。"
+
+#: ../clients/common/nm-vpn-helpers.c:121
+#, fuzzy
+msgid "Certificate password"
+msgstr "プライベートキーのパスワード"
+
+#: ../clients/common/nm-vpn-helpers.c:122
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "パスワードを表示する"
+
+#: ../clients/common/nm-vpn-helpers.c:125
+#: ../clients/common/nm-vpn-helpers.c:128
 #, fuzzy
 msgid "Group password"
 msgstr "パスワードを表示する"
 
-#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../clients/common/nm-vpn-helpers.c:109
+#: ../clients/common/nm-vpn-helpers.c:131
 msgid "Cookie"
 msgstr ""
 
-#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:132
 msgid "Gateway certificate hash"
 msgstr ""
 
@@ -6631,7 +6282,7 @@ msgstr ""
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:114
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "OK"
 
@@ -6661,23 +6312,38 @@ msgstr "エディタが失敗しました: %s"
 msgid "Could not re-read file: %s"
 msgstr "ファイルの再読み込みができませんでした: %s"
 
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
+msgid "Ethernet"
+msgstr "Ethernet"
+
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "イーサネット接続 %d"
 
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
+#: ../libnm/nm-device.c:1812
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1748
+#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
+#: ../libnm/nm-device.c:1820
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -6695,9 +6361,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
-#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
+#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
 msgid "Bond"
 msgstr "ボンド"
 
@@ -6706,9 +6372,9 @@ msgstr "ボンド"
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
-#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
+#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -6717,9 +6383,9 @@ msgstr "ブリッジ"
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
-#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
+#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
 msgid "Team"
 msgstr "team "
 
@@ -6964,10 +6630,6 @@ msgstr "接続されました"
 msgid "INFINIBAND"
 msgstr "インフィニバンド"
 
-#: ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "トランスポートモード"
-
 #: ../clients/tui/nmt-page-ip4.c:38
 msgid "Disabled"
 msgstr "無効"
@@ -7322,10 +6984,14 @@ msgid "Deactivate"
 msgstr "解除"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:108
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "終了"
 
+#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
+msgid "Back"
+msgstr ""
+
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -7409,28 +7075,28 @@ msgstr "新規のホスト名"
 msgid "Set system hostname"
 msgstr "システムのホスト名を設定する"
 
-#: ../clients/tui/nmtui.c:83
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:91
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
 msgstr "オプションを選択してください"
 
-#: ../clients/tui/nmtui.c:143
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
 msgstr "使い方"
 
-#: ../clients/tui/nmtui.c:224
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "引数を解析できませんでした"
 
-#: ../clients/tui/nmtui.c:234
+#: ../clients/tui/nmtui.c:251
 #, fuzzy, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "接続をアクティベートできませんでした: %s"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
 msgstr "NetworkManager が実行していません。"
 
@@ -7716,44 +7382,44 @@ msgstr "PKCS#12 ファイルを確証できません: %d"
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-core/nm-connection.c:224
+#: ../libnm-core/nm-connection.c:225
 msgid "wrong type; should be a list of strings."
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:294
+#: ../libnm-core/nm-connection.c:295
 #, fuzzy
 msgid "unknown setting name"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../libnm-core/nm-connection.c:306
+#: ../libnm-core/nm-connection.c:307
 #, fuzzy
 msgid "duplicate setting name"
 msgstr "エラー: 不明な設定 '%s'\n"
 
-#: ../libnm-core/nm-connection.c:873
+#: ../libnm-core/nm-connection.c:905
 msgid "setting not found"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:937
+#: ../libnm-core/nm-connection.c:969
 #, fuzzy
 msgid "setting not allowed in slave connection"
 msgstr "この接続には設定 '%s' はありません。\n"
 
-#: ../libnm-core/nm-connection.c:948
+#: ../libnm-core/nm-connection.c:980
 msgid "setting is required for non-slave connections"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1042
+#: ../libnm-core/nm-connection.c:1074
 #, fuzzy
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を削除できません: %s"
 
-#: ../libnm-core/nm-connection.c:1075
+#: ../libnm-core/nm-connection.c:1107
 #, fuzzy
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を削除できません: %s"
 
-#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
@@ -7764,7 +7430,7 @@ msgstr "接続を削除できません: %s"
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2162
+#: ../libnm-core/nm-setting-ip-config.c:2186
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -8009,7 +7675,7 @@ msgstr "プライベートキーの復号に失敗しました。"
 #: ../libnm-core/nm-setting-connection.c:844
 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2193
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8053,8 +7719,8 @@ msgstr "プロパティが無効です"
 #: ../libnm-core/nm-setting-infiniband.c:192
 #: ../libnm-core/nm-setting-infiniband.c:207
 #: ../libnm-core/nm-setting-ip4-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:211
+#: ../libnm-core/nm-setting-ip6-config.c:222
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
 #: ../libnm-core/nm-setting-wired.c:675
@@ -8191,13 +7857,13 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d' はプロパティの有効な値ではありません (%d 以下となるはずです)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:97
+#: ../libnm-core/nm-setting-team-port.c:109
 #, fuzzy, c-format
 msgid "missing setting"
 msgstr "足りないオプション"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:108
+#: ../libnm-core/nm-setting-team-port.c:120
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -8368,62 +8034,67 @@ msgstr "無効な IPv4 アドレス '%s'"
 msgid "Invalid IPv6 address '%s'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, fuzzy, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "無効な IPv4 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, fuzzy, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "無効な IPv6 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:170
+#: ../libnm-core/nm-setting-ip-config.c:168
 #, fuzzy, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "無効なメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:2182
+#: ../libnm-core/nm-setting-ip-config.c:2206
 #, fuzzy, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. IPv4 アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2198
+#: ../libnm-core/nm-setting-ip-config.c:2222
 #, fuzzy, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IPv4 アドレスは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2210
+#: ../libnm-core/nm-setting-ip-config.c:2234
 #, fuzzy, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IPv4 に無効なプレフィックスがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2219
+#: ../libnm-core/nm-setting-ip-config.c:2243
 #, fuzzy, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IPv4 に無効なプレフィックスがあります"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2257
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:2242
+#: ../libnm-core/nm-setting-ip-config.c:2266
 #, fuzzy
 msgid "gateway is invalid"
 msgstr "プロパティが無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2256
+#: ../libnm-core/nm-setting-ip-config.c:2280
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルートは無効です"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2289
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr ""
 
+#: ../libnm-core/nm-setting-ip-config.c:2300
+#, fuzzy, c-format
+msgid "a gateway is incompatible with '%s'"
+msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
+
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:144
+#: ../libnm-core/nm-setting-ip6-config.c:167
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, fuzzy, c-format
@@ -8433,9 +8104,9 @@ msgstr "このプロパティは '%s=%s' には許可されていません"
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:156
-#: ../libnm-core/nm-setting-ip6-config.c:166
-#: ../libnm-core/nm-setting-ip6-config.c:176
+#: ../libnm-core/nm-setting-ip6-config.c:179
+#: ../libnm-core/nm-setting-ip6-config.c:189
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8455,6 +8126,19 @@ msgstr "'%s' は有効な UUID ではありません"
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
 
+#: ../libnm-core/nm-setting-ip6-config.c:237
+#, fuzzy
+msgid "value is not a valid token"
+msgstr "'%s' は有効な UUID ではありません"
+
+#: ../libnm-core/nm-setting-ip6-config.c:248
+msgid "only makes sense with EUI64 address generation mode"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip6-config.c:260
+msgid "token is not in canonical form"
+msgstr ""
+
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, fuzzy, c-format
 msgid "'%d' is not a valid tunnel mode"
@@ -8700,164 +8384,184 @@ msgstr ""
 msgid "secret is not set"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2447
+#: ../libnm-core/nm-utils.c:2445
 #, fuzzy, c-format
 msgid "failed stat file %s: %s"
 msgstr "信号マスクの設定に失敗しました: %d"
 
-#: ../libnm-core/nm-utils.c:2456
+#: ../libnm-core/nm-utils.c:2454
 #, fuzzy, c-format
 msgid "not a file (%s)"
 msgstr "'%s' ファイルを読み込めませんでした。\n"
 
-#: ../libnm-core/nm-utils.c:2467
+#: ../libnm-core/nm-utils.c:2465
 #, fuzzy, c-format
 msgid "invalid file owner %d for %s"
 msgstr "'%s' は無効なフィールドです; 許可されているのは次のフィールドです: %s"
 
-#: ../libnm-core/nm-utils.c:2478
+#: ../libnm-core/nm-utils.c:2476
 #, c-format
 msgid "file permissions for %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2488
+#: ../libnm-core/nm-utils.c:2486
 #, c-format
 msgid "reject %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2508
+#: ../libnm-core/nm-utils.c:2506
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2522
+#: ../libnm-core/nm-utils.c:2520
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2530
+#: ../libnm-core/nm-utils.c:2528
 #, fuzzy, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "'%s' は有効な '%s' の値ではありません"
 
-#: ../libnm-core/nm-utils.c:2540
+#: ../libnm-core/nm-utils.c:2538
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
+#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:132
+#: ../libnm-core/nm-vpn-editor-plugin.c:296
 #, c-format
-msgid "cannot load plugin %s"
+msgid "cannot load plugin \"%s\": %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:160
+#: ../libnm-core/nm-vpn-editor-plugin.c:307
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:167
+#: ../libnm-core/nm-vpn-editor-plugin.c:332
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
+msgid "unknown error initializing plugin %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:183
+#: ../libnm-core/nm-vpn-editor-plugin.c:349
 #, c-format
-msgid "unknown error initializing plugin %s"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:195
+#: ../libnm-core/nm-vpn-editor-plugin.c:358
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:256
+#: ../libnm-core/nm-vpn-editor-plugin.c:501
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:276
+#: ../libnm-core/nm-vpn-editor-plugin.c:521
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:109
+#: ../libnm-core/nm-vpn-plugin-info.c:110
 #, fuzzy, c-format
 msgid "missing filename"
 msgstr "足りないオプション"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:117
+#: ../libnm-core/nm-vpn-plugin-info.c:118
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:126
+#: ../libnm-core/nm-vpn-plugin-info.c:127
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:383
+#: ../libnm-core/nm-vpn-plugin-info.c:450
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:421
+#: ../libnm-core/nm-vpn-plugin-info.c:488
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:740
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
 #, fuzzy, c-format
 msgid "missing \"plugin\" setting"
 msgstr "足りないオプション"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:750
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:842
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
 msgid "missing filename to load VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:854
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
 msgid "missing name for VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:863
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
 msgid "missing service for VPN plugin info"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
+#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
+#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
+msgid "OLPC Mesh"
+msgstr "OLPC メッシュ"
+
+#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
 #, fuzzy
 msgid "MACVLAN"
 msgstr "VLAN"
 
-#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
+msgid "VXLAN"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
 msgid "IPTunnel"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
+#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
+msgid "Tun"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
 msgid "Veth"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
+#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
+#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
+#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
 msgid "USB"
 msgstr "USB"
 
@@ -8867,8 +8571,8 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
-#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
+#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
+#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -9070,7 +8774,7 @@ msgstr ""
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "’OLPC メッシュ' 接続タイプには 2 種類のオプション引数があります。\n"
 
-#: ../libnm/nm-device-team.c:118
+#: ../libnm/nm-device-team.c:139
 #, fuzzy
 msgid "The connection was not a team connection."
 msgstr "接続は削除されました"
@@ -9114,22 +8818,22 @@ msgstr ""
 msgid "The connection was not a WiMAX connection."
 msgstr "'WiMax' 接続タイプには 1 種類のオプション引数があります。\n"
 
-#: ../libnm/nm-device.c:2729
+#: ../libnm/nm-device.c:2739
 #, fuzzy, c-format
 msgid "The connection was not valid: %s"
 msgstr "エラー: 接続は無効です: %s\n"
 
-#: ../libnm/nm-device.c:2738
+#: ../libnm/nm-device.c:2748
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
 
-#: ../libnm/nm-manager.c:874
+#: ../libnm/nm-manager.c:867
 #, fuzzy
 msgid "Active connection could not be attached to the device"
 msgstr "アクティブな接続またはデバイスがありません"
 
-#: ../libnm/nm-manager.c:1098
+#: ../libnm/nm-manager.c:1091
 #, fuzzy
 msgid "Active connection removed before it was initialized"
 msgstr "アクティブな接続の詳細"
@@ -9158,6 +8862,18 @@ msgstr ""
 "れます"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+#, fuzzy
+msgid "Reload NetworkManager configuration"
+msgstr "NetworkManager のバージョンを表示して終了する"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+#, fuzzy
+msgid "System policy prevents reloading NetworkManager"
+msgstr ""
+"システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止さ"
+"れます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
@@ -9165,132 +8881,132 @@ msgstr ""
 "NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用は"
 "システムの電源管理に限ってください)"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr ""
 "システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ"
 "状態からの解除が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable WiFi devices"
 msgstr "Wi-Fi デバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
 "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable mobile broadband devices"
 msgstr "モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
 "システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が"
 "阻止されています"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "WiMAX モバイルブロードバンドのデバイスを有効または無効にする"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
 "システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無"
 "効化が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Allow control of network connections"
 msgstr "ネットワーク接続の制御を許可"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
 msgid "System policy prevents control of network connections"
 msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via a protected WiFi network"
 msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止され"
 "ます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Connection sharing via an open WiFi network"
 msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr ""
 "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻"
 "止されます。"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify personal network connections"
 msgstr "個人のネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of personal network settings"
 msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify network connections for all users"
 msgstr "全ユーザーのネットワーク接続を編集"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of network settings for all users"
 msgstr "システムポリシーにより全ユーザーのネットワーク設定の編集が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent system hostname"
 msgstr "永続的なシステムのホスト名を修正"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent global DNS configuration"
 msgstr ""
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
 #, fuzzy
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
 
-#: ../shared/nm-shared-utils.c:174
+#: ../shared/nm-utils/nm-shared-utils.c:185
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-shared-utils.c:181
+#: ../shared/nm-utils/nm-shared-utils.c:192
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-shared-utils.c:188
+#: ../shared/nm-utils/nm-shared-utils.c:199
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-shared-utils.c:196
+#: ../shared/nm-utils/nm-shared-utils.c:207
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-shared-utils.c:205
+#: ../shared/nm-utils/nm-shared-utils.c:216
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:227
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9301,54 +9017,50 @@ msgstr ""
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:111
+#: ../src/NetworkManagerUtils.c:112
 #, fuzzy, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %s"
 
-#: ../src/main.c:220 ../src/main.c:358
+#: ../src/main.c:165 ../src/main.c:300
 #, fuzzy, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定の読み込みに失敗しました: (%d) %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:297
+#: ../src/main.c:179 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:298
+#: ../src/main.c:180 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "デーモンにしない"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:300
+#: ../src/main.c:181 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] のいずれか"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:302
+#: ../src/main.c:183 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:304
+#: ../src/main.c:185 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "すべての警告を致命的にする"
 
-#: ../src/main.c:241
+#: ../src/main.c:186
 msgid "Specify the location of a PID file"
 msgstr "PID ファイルの場所を指定する"
 
-#: ../src/main.c:242
-msgid "State file location"
-msgstr "状態ファイルの場所"
-
-#: ../src/main.c:244
+#: ../src/main.c:188
 #, fuzzy
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager のバージョンを表示して終了する"
 
-#: ../src/main.c:254
+#: ../src/main.c:198
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -9360,66 +9072,66 @@ msgstr ""
 "ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
 "ユーザーによる指定も許可されます。"
 
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392
+#: ../src/main.c:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:397
+#: ../src/main.c:290 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:373
+#: ../src/main.c:315
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "設定ファイルにエラーが発生しました: %s\n"
 
-#: ../src/main.c:378
+#: ../src/main.c:320
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "設定ファイルにある未認識のログドメイン '%s' を無視します。\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:407
+#: ../src/main.c:331 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化できませんでした: %s [エラー %u]\n"
 
-#: ../src/main-utils.c:99
+#: ../src/main-utils.c:98
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s のオープンに失敗しました: %s\n"
 
-#: ../src/main-utils.c:105
+#: ../src/main-utils.c:104
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s への書き込みに失敗しました: %s\n"
 
-#: ../src/main-utils.c:110
+#: ../src/main-utils.c:109
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/main-utils.c:145
+#: ../src/main-utils.c:144
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr ""
 
-#: ../src/main-utils.c:197
+#: ../src/main-utils.c:196
 #, fuzzy, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "NetworkManager はすでに起動しています (pid %ld)\n"
 
-#: ../src/main-utils.c:207
+#: ../src/main-utils.c:206
 #, fuzzy, c-format
 msgid "You must be root to run %s!\n"
 msgstr "NetworkManager を実行するには root になる必要があります!\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -9428,12 +9140,7 @@ msgstr ""
 "# %s からマージされています\n"
 "\n"
 
-#: ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 接続 %d"
-
-#: ../src/devices/bluetooth/nm-bluez-device.c:197
+#: ../src/devices/bluetooth/nm-bluez-device.c:200
 #, c-format
 msgid "%s Network"
 msgstr "%s ネットワーク"
@@ -9460,13 +9167,13 @@ msgid "DUN connection must include a GSM or CDMA setting"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:655
+#: ../src/devices/wwan/nm-modem-broadband.c:687
 #, fuzzy
 msgid "GSM connection"
 msgstr "GSM 接続 %d"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:679
+#: ../src/devices/wwan/nm-modem-broadband.c:711
 #, fuzzy
 msgid "CDMA connection"
 msgstr "CDMA 接続 %d"
@@ -9476,9 +9183,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:192
-#: ../src/devices/wifi/nm-device-wifi.c:872
+#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-infiniband.c:193
+#: ../src/devices/wifi/nm-device-wifi.c:875
 #, fuzzy
 msgid "connection does not match device"
 msgstr "アクティブな接続またはデバイスがありません"
@@ -9493,32 +9200,27 @@ msgstr "ボンド接続 %d"
 msgid "Bridge connection"
 msgstr "ブリッジ接続 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1402
 #, fuzzy
 msgid "PPPoE connection"
 msgstr "PPPoE 接続 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1402
 #, fuzzy
 msgid "Wired connection"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ethernet-utils.c:39
+#: ../src/devices/nm-device-ethernet-utils.c:36
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-infiniband.c:174
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 接続 %d"
-
-#: ../src/devices/nm-device-ip-tunnel.c:346
+#: ../src/devices/nm-device-ip-tunnel.c:347
 #, fuzzy
 msgid "IP tunnel connection"
 msgstr "接続の編集"
 
-#: ../src/devices/nm-device-macvlan.c:428
+#: ../src/devices/nm-device-macvlan.c:436
 #, fuzzy
 msgid "MACVLAN connection"
 msgstr "VLAN 接続 %d"
@@ -9528,17 +9230,7 @@ msgstr "VLAN 接続 %d"
 msgid "TUN connection"
 msgstr "DUN 接続 %d"
 
-#: ../src/devices/nm-device-vlan.c:447
-#, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 接続 %d"
-
-#: ../src/devices/nm-device-vxlan.c:373
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 接続 %d"
-
-#: ../src/devices/team/nm-device-team.c:115
+#: ../src/devices/team/nm-device-team.c:121
 #, fuzzy
 msgid "Team connection"
 msgstr "team 接続 %d"
@@ -9548,7 +9240,7 @@ msgstr "team 接続 %d"
 msgid "Mesh"
 msgstr "Mesh %d"
 
-#: ../src/devices/wifi/nm-device-wifi.c:839
+#: ../src/devices/wifi/nm-device-wifi.c:842
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr ""
 
@@ -9707,594 +9399,187 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "復号化用シンメトリックキーの設定に失敗しました。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:641
+#: ../src/devices/wwan/nm-modem-broadband.c:673
 #, fuzzy
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "モバイルブロードバンド接続 %d"
 
-#: ../src/nm-config.c:465
+#: ../src/nm-config.c:500
 msgid "Config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:466
+#: ../src/nm-config.c:501
 msgid "Config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:467
+#: ../src/nm-config.c:502
 #, fuzzy
 msgid "System config directory location"
 msgstr "設定ディレクトリの場所"
 
-#: ../src/nm-config.c:468
+#: ../src/nm-config.c:503
 #, fuzzy
 msgid "Internal config file location"
 msgstr "設定ファイルの場所"
 
-#: ../src/nm-config.c:469
+#: ../src/nm-config.c:504
+msgid "State file location"
+msgstr "状態ファイルの場所"
+
+#: ../src/nm-config.c:505
 msgid "State file for no-auto-default devices"
 msgstr ""
 
-#: ../src/nm-config.c:470
+#: ../src/nm-config.c:506
 msgid "List of plugins separated by ','"
 msgstr "複数のプラグインを「,」で区切った一覧"
 
-#: ../src/nm-config.c:471
+#: ../src/nm-config.c:507
 #, fuzzy
 msgid "Quit after initial configuration"
 msgstr "現在の nmcli 設定:\n"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "デーモンにせず、stderr にログ記録する"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:475
+#: ../src/nm-config.c:511
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インターネットの接続性を確認するための http(s) アドレス"
 
-#: ../src/nm-config.c:476
+#: ../src/nm-config.c:512
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性チェックの間隔 (秒単位)"
 
-#: ../src/nm-config.c:477
+#: ../src/nm-config.c:513
 msgid "The expected start of the response"
 msgstr "期待されている応答の開始点"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 #, fuzzy
 msgid "The interface to manage"
 msgstr "親インターフェース [none]: "
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "eth0"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 #, fuzzy
 msgid "Connection UUID"
 msgstr "接続"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 #, fuzzy
 msgid "Current DHCPv4 address"
 msgstr "クローンの MAC アドレス"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 #, fuzzy
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "サポートの無い DHCP クライアント '%s'"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "barbar"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 #, fuzzy
 msgid "Route priority for IPv4"
 msgstr "削除する優先度がありません"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "0"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 #, fuzzy
 msgid "Route priority for IPv6"
 msgstr "削除する優先度がありません"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "1024"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr ""
 
-#: ../src/nm-iface-helper.c:373
+#: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr ""
 
-#: ../src/nm-iface-helper.c:441
+#: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr ""
 
-#: ../src/nm-logging.c:216
+#: ../src/nm-logging.c:223
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明なログレベル '%s'"
 
-#: ../src/nm-logging.c:309
+#: ../src/nm-logging.c:318
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/nm-manager.c:3625
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 接続"
-
-#: ../src/nm-sleep-monitor-systemd.c:131
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager でネットワークをオフにする必要があります"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:108
+#: ../src/settings/plugins/ifcfg-rh/reader.c:106
 msgid "System"
 msgstr "システム"
-
-#, fuzzy
-#~ msgid "Error: unknown parameter: %s"
-#~ msgstr "不明なパラメーター: %s\n"
-
-#, fuzzy
-#~ msgid "'%s' is not a valid powersave value"
-#~ msgstr "'%s' は有効な二重値ではありません"
-
-#~ msgid "Failed to read configuration: (%d) %s\n"
-#~ msgstr "設定の読み込みに失敗しました: (%d) %s\n"
-
-#~ msgid "no usable DHCP client could be found."
-#~ msgstr "使用できる DHCP クライアントが見つかりませんでした。"
-
-#~ msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-#~ msgstr ""
-#~ "注記: libc リゾルバーは 3つ以上のネームサーバーをサポートできません。"
-
-#~ msgid "The nameservers listed below may not be recognized."
-#~ msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
-
-#~ msgid "invalid prefix '%s'; <1-128> allowed"
-#~ msgstr "無効なプレフィックス '%s'; <1-128> 許可"
-
-#~ msgid "invalid prefix '%s'; <0-32> allowed"
-#~ msgstr "無効なプレフィックス '%s'; <0-32> 許可"
-
-#~ msgid "invalid next hop address '%s'"
-#~ msgstr "無効なネクストホップアドレス '%s'"
-
-#~ msgid "invalid IPv6 route '%s'"
-#~ msgstr "無効な IPv6 ルート '%s'"
-
-#~ msgid "invalid prefix '%s'; <0-128> allowed"
-#~ msgstr "無効なプレフィックス '%s'; <0-128> 許可"
-
-#~ msgid ""
-#~ "Usage: nmcli connection show { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
-#~ "\n"
-#~ "Show connections which are currently used by a device to connect to a "
-#~ "network.\n"
-#~ "Without a parameter, all active connections are listed. When <ID> is "
-#~ "provided,\n"
-#~ "the connection details are displayed instead.\n"
-#~ "\n"
-#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-#~ "\n"
-#~ "Show in-memory and on-disk connections, some of which may also be active "
-#~ "if\n"
-#~ "a device is using that connection profile. Without a parameter, all "
-#~ "profiles\n"
-#~ "are listed. When <ID> is provided, the profile details are displayed "
-#~ "instead.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "使い方: nmcli connection show { 引数 | help }\n"
-#~ "\n"
-#~ "引数の種類 := active [[id | uuid | path | apath] <ID>]\n"
-#~ "\n"
-#~ "ネットワーク接続のため現在デバイスで使用されている接続を表示します。\n"
-#~ "パラメータを付けずに実行するとアクティブな接続がすべて表示されます。\n"
-#~ "<ID> を与えると、代わりに接続の詳細が表示されます。\n"
-#~ "\n"
-#~ "引数の種類 := configured [[id | uuid | path] <ID>]\n"
-#~ "\n"
-#~ "インメモリとオンディスクの接続を表示します。デバイスでその接続プロファイル"
-#~ "を\n"
-#~ "使用している場合、その接続もアクティブになることがあります。パラメータを付"
-#~ "けず\n"
-#~ "に実行すると、すべてのプロファイルが表示されます。<ID> を与えると、代わり"
-#~ "に\n"
-#~ "プロファイルの詳細が表示されます。\n"
-
-#~ msgid ""
-#~ "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-#~ "[<value>]\n"
-#~ "\n"
-#~ "Modify a single property in the connection profile.\n"
-#~ "The profile is identified by its name, UUID or D-Bus path.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "使い方: nmcli connection modify { 引数 | help }\n"
-#~ "\n"
-#~ "引数の種類 := [id | uuid | path] <ID> <setting name>.<property name> "
-#~ "[<value>]\n"
-#~ "\n"
-#~ "接続プロファイル内のプロパティをひとつ変更します。\n"
-#~ "プロファイルは名前、UUID、D-Bus パスで識別します。\n"
-#~ "\n"
-
-#~ msgid "Error: 'list configured': %s"
-#~ msgstr "エラー: 'list configured': %s"
-
-#~ msgid "List of configured connections"
-#~ msgstr "設定されている接続の一覧"
-
-#~ msgid "Error: 'show configured': %s"
-#~ msgstr "エラー: 'show configured': %s"
-
-#~ msgid "Error: 'list active': %s"
-#~ msgstr "エラー: 'list active': %s"
-
-#~ msgid "List of active connections"
-#~ msgstr "アクティブな接続の一覧"
-
-#~ msgid ""
-#~ "Error: Device '%s' is waiting for slaves before proceeding with "
-#~ "activation."
-#~ msgstr ""
-#~ "エラー: デバイス '%s' はアクティベートのプロセスを開始する前にスレーブを待"
-#~ "機しています"
-
-#~ msgid ""
-#~ "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
-#~ "connected]."
-#~ msgstr ""
-#~ "エラー: 'mode': '%s' は有効な InfiniBand 転送モードではありません "
-#~ "[datagram, connected]。"
-
-#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
-#~ msgstr "'%s ' 接続タイプには 3 種類のオプション引数があります。\n"
-
-#~ msgid "Transport mode (datagram or connected) [datagram]: "
-#~ msgstr "転送モード (datagram または connected) [datagram]: "
-
-#~ msgid ""
-#~ "There are 2 optional arguments for 'mobile broadband' connection type.\n"
-#~ msgstr ""
-#~ "'モバイルブロードバンド' 接続タイプには 2 種類のオプション引数がありま"
-#~ "す。\n"
-
-#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
-#~ msgstr "Bluetooth タイプ (panu、dun-gsm、dun-cdma) [panu]: "
-
-#~ msgid "There are optional arguments for 'bond' connection type.\n"
-#~ msgstr "'bond' 接続タイプにはオプションの引数があります。\n"
-
-#~ msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
-#~ msgstr "ボンドのモニタリングモード (miimon または arp) [miimon]: "
-
-#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
-#~ msgstr "'bridge' 接続タイプには 6 種類のオプション引数があります。\n"
-
-#~ msgid "Error: 'stp': '%s'.\n"
-#~ msgstr "エラー:'stp': %s。\n"
-
-#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
-#~ msgstr "'bridge-slave' 接続タイプには 3 種類のオプション引数があります。\n"
-
-#~ msgid "Hairpin (yes/no) [yes]: "
-#~ msgstr "ヘアピン (yes/no) [yes]: "
-
-#~ msgid "Error: 'hairpin': '%s'.\n"
-#~ msgstr "エラー: 'hairpin': '%s'。\n"
-
-#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
-#~ msgstr "'VPN' 接続タイプには 1 種類のオプション引数があります。\n"
-
-#~ msgid ""
-#~ "Warning: 'type' is currently ignored. We only support ethernet slaves for "
-#~ "now.\n"
-#~ msgstr ""
-#~ "警告: 現在、'タイプ' は無視されています。対応しているのは Ethernet スレー"
-#~ "ブのみになります。\n"
-
-#~ msgid "Team master: "
-#~ msgstr "team マスター: "
-
-#~ msgid "Bridge master: "
-#~ msgstr "ブリッジマスター: "
-
-#~ msgid ""
-#~ "save  :: save the connection\n"
-#~ "\n"
-#~ "Sends the connection to NetworkManager that will save it.\n"
-#~ msgstr ""
-#~ "save  :: 接続の保存\n"
-#~ "\n"
-#~ "接続を保存する NetworkManager にこの接続を送信します。\n"
-
-#~ msgid ""
-#~ "remove [<index>|<option>]  :: delete the value\n"
-#~ "\n"
-#~ "Removes the property value (sets it to default).\n"
-#~ msgstr ""
-#~ "remove [<index>|<option>]  :: 値の削除\n"
-#~ "\n"
-#~ "プロパティ値を削除します (プロパティ値をデフォルトに戻す)。\n"
-
-#~ msgid "Error: bad color number: '%s'; use <0-8>\n"
-#~ msgstr "エラー: 色番号が正しくありません: '%s'; <0-8> を使用してください\n"
-
-#~ msgid ""
-#~ ">>> Command-line editing is not available. Consider installing a line "
-#~ "editing library to enable the feature. <<<\n"
-#~ "Supported libraries are:\n"
-#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-#~ "readline/rltop.html\n"
-#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-#~ msgstr ""
-#~ ">>> コマンドライン編集は使用できません。この機能を有効にする場合は、ライン"
-#~ "編集ライブラリのインストールを検討してください。 <<<\n"
-#~ "対応ライブラリは次の通りです:\n"
-#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-#~ "readline/rltop.html\n"
-#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-
-#~ msgid ""
-#~ "Error: 'configured' or 'active' command is expected for 'connection show'."
-#~ msgstr ""
-#~ "エラー: 'connection show' には 'configured' または 'active' コマンドの使用"
-#~ "が期待されています。"
-
-#~ msgid "Error: Can't obtain connections: settings service is not running."
-#~ msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません。"
-
-#~ msgid "Home"
-#~ msgstr "ホーム"
-
-#~ msgid "Partner"
-#~ msgstr "パートナー"
-
-#~ msgid "Roaming"
-#~ msgstr "ローミング"
-
-#~ msgid "Device '%s' has been disconnected.\n"
-#~ msgstr "デバイス '%s' は切断されています。\n"
-
-#~ msgid "WiMAX NSP list"
-#~ msgstr "WiMAX NSP 一覧"
-
-#~ msgid "Error: 'device wimax': %s"
-#~ msgstr "エラー: 'device wimax': %s"
-
-#~ msgid "Error: NSP with name '%s' not found."
-#~ msgstr "エラー: '%s' と言う名前の NSP が見つかりませんでした。"
-
-#~ msgid "Error: Device '%s' is not a WiMAX device."
-#~ msgstr "エラー: デバイス '%s' は WiMAX デバイスではありません。"
-
-#~ msgid "Error: Access point with nsp '%s' not found."
-#~ msgstr "エラー: nsp '%s' のアクセスポイントが見つかりませんでした。"
-
-#~ msgid "Error: 'device wimax' command '%s' is not valid."
-#~ msgstr "エラー: 'dev wimax' のコマンド '%s' は無効です。"
-
-#~ msgid ""
-#~ "Usage: nmcli radio wimax { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [on | off]\n"
-#~ "\n"
-#~ "Get status of WiMAX radio switch, or turn it on/off.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "使い方: nmcli radio wimax { 引数 | help }\n"
-#~ "\n"
-#~ "引数の種類 := [on | off]\n"
-#~ "\n"
-#~ "WiMAX ラジオスイッチの状態を取得、またはオンかオフにします。\n"
-#~ "\n"
-
-#~ msgid "not running"
-#~ msgstr "実行していません"
-
-#~ msgid "Error: %s"
-#~ msgstr "エラー: %s"
-
-#~ msgid "WiMAX radio switch"
-#~ msgstr "WiMAX ラジオスイッチ"
-
-#~ msgid "0 (unknown)"
-#~ msgstr "0 (不明)"
-
-#~ msgid "any, "
-#~ msgstr "いずれでも、"
-
-#~ msgid "900 MHz, "
-#~ msgstr "900 MHz, "
-
-#~ msgid "1800 MHz, "
-#~ msgstr "1800 MHz, "
-
-#~ msgid "1900 MHz, "
-#~ msgstr "1900 MHz, "
-
-#~ msgid "850 MHz, "
-#~ msgstr "850 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 2100 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 2100 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 1800 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1800 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 800 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 800 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 850 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 850 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 900 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 900 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 1700 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1700 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 1900 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1900 MHz, "
-
-#~ msgid "WCDMA 3GPP UMTS 2600 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 2600 MHz, "
-
-#~ msgid "'%s' is not valid (use ip[/prefix] [gateway])"
-#~ msgstr "'%s' は無効です (ip[/prefix] [gateway] を使用してください)"
-
-#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
-#~ msgstr ""
-#~ "'%s' は無効です (<dest IP>/prefix <next-hop IP> [metric] を使用してくださ"
-#~ "い)"
-
-#~ msgid "Failed to set symmetric key for decryption: %s / %s."
-#~ msgstr "復号用のシンメトリックキーの設定に失敗しました: %s / %s。"
-
-#~ msgid "Failed to set IV for decryption: %s / %s."
-#~ msgstr "復号用の IV の設定に失敗しました: %s / %s。"
-
-#~ msgid "Failed to set symmetric key for encryption: %s / %s."
-#~ msgstr "暗号化用のシンメトリックキーの設定に失敗しました: %s / %s。"
-
-#~ msgid "Failed to set IV for encryption: %s / %s."
-#~ msgstr "暗号化用の IV の設定に失敗しました: %s / %s。"
-
-#~ msgid "'%s' doesn't match the virtual interface name '%s'"
-#~ msgstr "'%s' は仮想インターフェース名 '%s' と一致しません"
-
-#~ msgid "IPv4 configuration is not allowed for slave"
-#~ msgstr "IPv4 設定はスレーブには許可されていません"
-
-#~ msgid "IPv6 configuration is not allowed for slave"
-#~ msgstr "IPv6 設定はスレーブには許可されていません"
-
-#~ msgid "'%s' not allowed for %s=%s"
-#~ msgstr "'%s' は %s=%s に許可されません"
-
-#~ msgid "/path/to/state.file"
-#~ msgstr "/path/to/state.file"
-
-#~ msgid "GModules are not supported on your platform!\n"
-#~ msgstr "GModules はご使用のプラットフォームでは対応していません!\n"
-
-#~ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-#~ msgstr ""
-#~ "無効なオプションです。--help を使用して有効なオプションの一覧を確認してく"
-#~ "ださい。\n"
-
-#~ msgid "State file %s parsing failed: (%d) %s\n"
-#~ msgstr "状態ファイル %s の解析に失敗しました: (%d) %s\n"
-
-#~ msgid "'dhclient' could be found."
-#~ msgstr "'dhclient' が見つかりました。"
-
-#~ msgid "'dhcpcd' could be found."
-#~ msgstr "'dhcpcd' が見つかりました。"
-
-#~ msgid "/path/to/config.file"
-#~ msgstr "/path/to/config.file"
-
-#~ msgid "/path/to/config/dir"
-#~ msgstr "/path/to/config/dir"
-
-#~ msgid "plugin1,plugin2"
-#~ msgstr "plugin1,plugin2"
-
-#~ msgid "Bingo!"
-#~ msgstr "当たり!"
-
-#~ msgid "error occurred while waiting for data on socket"
-#~ msgstr "ソケット上でデータを待っている際にエラーが発生しました"
-
-#~ msgid "error processing netlink message: %s"
-#~ msgstr "netlink メッセージのプロセス中にエラー発生: %s"
-
-#~ msgid "unable to connect to netlink for monitoring link status: %s"
-#~ msgstr "リンク状況監視用のネットリンクに接続できません: %s"
-
-#~ msgid "unable to enable netlink handle credential passing: %s"
-#~ msgstr "netlink ハンドル信任情報の伝達を有効にできません: %s"
-
-#~ msgid "unable to allocate netlink handle for monitoring link status: %s"
-#~ msgstr ""
-#~ "リンクステータス監視用のネットリンクハンドルを割り当てできません: %s"
-
-#~ msgid "unable to join netlink group: %s"
-#~ msgstr "netlink グループへ参加できません: %s"