From 4f8a029a6574e33eb1466840fe41ff02a52dea92 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 12 Dec 2017 10:46:10 +0100
Subject: [PATCH 1/3] po: add zanata.xml
---
zanata.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 zanata.xml
diff --git a/zanata.xml b/zanata.xml
new file mode 100644
index 0000000..4c7147b
--- /dev/null
+++ b/zanata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+ Maintainers:
+ do a "make -C po NetworkManager.pot" before "zanata-cli push -''-push-type=both"
+-->
+
+<config xmlns="http://zanata.org/namespace/config/">
+ <url>https://vendors.zanata.redhat.com/</url>
+ <project>networkmanager</project>
+ <project-version>RHEL-7.6</project-version>
+ <project-type>gettext</project-type>
+ <src-dir>po</src-dir>
+ <trans-dir>po</trans-dir>
+ <rules/>
+</config>
--
2.17.1
From 2021084e8dec54ea581886f4f7f6c61a124c8068 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sun, 19 Aug 2018 13:04:25 +0200
Subject: [PATCH 2/3] po/ja: translations from the Red Hat translators
---
po/ja.po | 4941 ++++++++++++++++++++++++++++--------------------------
1 file changed, 2609 insertions(+), 2332 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index f54f8a4..35f9c7c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,20 +7,23 @@
# Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
# amoewaki <amoewaki@redhat.com>, 2017. #zanata
# lrintel <lrintel@redhat.com>, 2017. #zanata
+# amoewaki <amoewaki@redhat.com>, 2018. #zanata
+# kemorigu <kemorigu@redhat.com>, 2018. #zanata
+# lrintel <lrintel@redhat.com>, 2018. #zanata
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 10:22+0100\n"
-"PO-Revision-Date: 2017-12-04 11:32+0000\n"
-"Last-Translator: amoewaki <amoewaki@redhat.com>\n"
+"POT-Creation-Date: 2018-08-19 12:54+0200\n"
+"PO-Revision-Date: 2018-08-16 01:39+0000\n"
+"Last-Translator: kemorigu <kemorigu@redhat.com>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.3.2\n"
+"X-Generator: Zanata 4.6.0\n"
#: ../clients/cli/agent.c:40
#, c-format
@@ -32,7 +35,7 @@ msgid ""
msgstr ""
"使い方: nmcli agent { COMMAND | help }\n"
"\n"
-"COMMAND := { secret | polkit | all }\n"
+"コマンド := { secret | polkit | all }\n"
"\n"
"\n"
@@ -87,48 +90,49 @@ msgstr ""
"す。\n"
"\n"
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:157
#, c-format
msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
msgstr ""
"nmcli は NetworkManager のシークレットエージェントとして適切に登録されまし"
"た。\n"
-#: ../clients/cli/agent.c:160
+#: ../clients/cli/agent.c:159
#, c-format
msgid "Error: secret agent initialization failed"
msgstr "エラー: シークレットエージェントの初期化に失敗しました"
-#: ../clients/cli/agent.c:179
+#: ../clients/cli/agent.c:178
#, c-format
msgid "Error: polkit agent initialization failed: %s"
msgstr "エラー: polkit エージェントの初期化に失敗しました: %s"
-#: ../clients/cli/agent.c:187
+#: ../clients/cli/agent.c:186
#, c-format
msgid "nmcli successfully registered as a polkit agent.\n"
msgstr "nmcli が polkit エージェントとして適切に登録されました。\n"
-#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
+#: ../clients/cli/common.c:306 ../clients/cli/common.c:332
+#: ../clients/cli/connections.c:1297
msgid "GROUP"
msgstr "グループ"
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:606
#, c-format
msgid "Error: openconnect failed: %s\n"
msgstr "エラー: openconnect が失敗しました: %s\n"
-#: ../clients/cli/common.c:566
+#: ../clients/cli/common.c:613
#, c-format
msgid "Error: openconnect failed with status %d\n"
msgstr "エラー: openconnect がステータス %d で失敗しました\n"
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:615
#, c-format
msgid "Error: openconnect failed with signal %d\n"
msgstr "エラー: openconnect がシグナル %d で失敗しました\n"
-#: ../clients/cli/common.c:648
+#: ../clients/cli/common.c:695
#, c-format
msgid ""
"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -137,25 +141,25 @@ msgstr ""
"警告: '%s' のパスワードが 'passwd-file' で提供されていません。nmcli は '--"
"ask' オプションがないと尋ねることができません。\n"
-#: ../clients/cli/common.c:1114
+#: ../clients/cli/common.c:1185
#, c-format
msgid "Error: Could not create NMClient object: %s."
msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s。"
-#: ../clients/cli/common.c:1134
+#: ../clients/cli/common.c:1205
msgid "Error: NetworkManager is not running."
msgstr "エラー: NetworkManager が起動していません。"
-#: ../clients/cli/common.c:1231
+#: ../clients/cli/common.c:1301
#, c-format
msgid "Error: argument '%s' not understood. Try passing --help instead."
msgstr "エラー: 引数 '%s' が認識されません。代わりに --help を渡してください。"
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1311
msgid "Error: missing argument. Try passing --help."
msgstr "エラー: 引数がありません。--help を渡してください。"
-#: ../clients/cli/common.c:1294
+#: ../clients/cli/common.c:1364
msgid "access denied"
msgstr "アクセスは拒否されました"
@@ -166,7 +170,7 @@ msgstr "設定名は? "
#: ../clients/cli/connections.c:65
msgid "Property name? "
-msgstr "プロパティ名は? "
+msgstr "プロパティー名は? "
#: ../clients/cli/connections.c:66
msgid "Enter connection type: "
@@ -189,7 +193,70 @@ msgstr "接続 (名前、UUID またはパス)"
msgid "Connection(s) (name, UUID, path or apath)"
msgstr "接続 (名前、UUID、パス または apath)"
-#: ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
+#: ../clients/cli/devices.c:1201 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1247 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
+#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-meta-setting-desc.c:1482
+#: ../clients/common/nm-meta-setting-desc.c:1532
+#: ../clients/common/nm-meta-setting-desc.c:2681
+#: ../clients/common/nm-meta-setting-desc.c:2736
+msgid "unknown"
+msgstr "不明"
+
+#: ../clients/cli/connections.c:81
+msgid "activating"
+msgstr "アクティベート中"
+
+#: ../clients/cli/connections.c:82
+msgid "activated"
+msgstr "アクティベート済み"
+
+#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:284
+msgid "deactivating"
+msgstr "停止中"
+
+#: ../clients/cli/connections.c:84
+msgid "deactivated"
+msgstr "停止しました"
+
+#: ../clients/cli/connections.c:90
+msgid "VPN connecting (prepare)"
+msgstr "VPN 接続（準備）"
+
+#: ../clients/cli/connections.c:91
+msgid "VPN connecting (need authentication)"
+msgstr "VPN 接続（認証が必要）"
+
+#: ../clients/cli/connections.c:92
+msgid "VPN connecting"
+msgstr "VPN 接続"
+
+#: ../clients/cli/connections.c:93
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN 接続（IP 設定を取得）"
+
+#: ../clients/cli/connections.c:94
+msgid "VPN connected"
+msgstr "VPN 接続済み"
+
+#: ../clients/cli/connections.c:95
+msgid "VPN connection failed"
+msgstr "VPN 接続失敗"
+
+#: ../clients/cli/connections.c:96
+msgid "VPN disconnected"
+msgstr "VPN 切断済み"
+
+#: ../clients/cli/connections.c:452
+msgid "never"
+msgstr "しない"
+
+#: ../clients/cli/connections.c:713
#, c-format
msgid ""
"Usage: nmcli connection { COMMAND | help }\n"
@@ -266,7 +333,7 @@ msgstr ""
" export [id | uuid | path] <ID> [<output file>]\n"
"\n"
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:735
#, c-format
msgid ""
"Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -315,7 +382,7 @@ msgstr ""
"関連するシークレットも表示する場合は、グローバルな --show-secrets オプション"
"を使用します。\n"
-#: ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:756
#, c-format
msgid ""
"Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -359,7 +426,7 @@ msgstr ""
"passwd-file - 接続をアクティブにするのに必要なパスワードを含むファイル\n"
"\n"
-#: ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:777
#, c-format
msgid ""
"Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -381,7 +448,7 @@ msgstr ""
"で識別します。\n"
"\n"
-#: ../clients/cli/connections.c:271
+#: ../clients/cli/connections.c:789
#, c-format
msgid ""
"Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -680,7 +747,7 @@ msgstr ""
" [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
"\n"
-#: ../clients/cli/connections.c:389
+#: ../clients/cli/connections.c:907
#, c-format
msgid ""
"Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -726,7 +793,7 @@ msgstr ""
"nmcli con mod bond0 -bond.options downdelay\n"
"\n"
-#: ../clients/cli/connections.c:412
+#: ../clients/cli/connections.c:930
#, c-format
msgid ""
"Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -749,7 +816,7 @@ msgstr ""
"を除き、<ID> の完全なコピーになります。\n"
"\n"
-#: ../clients/cli/connections.c:424
+#: ../clients/cli/connections.c:942
#, c-format
msgid ""
"Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -768,7 +835,7 @@ msgstr ""
"\n"
"引数 := [id | uuid | path] <ID>\n"
"\n"
-"インテラクティブなエディタで既存の接続プロファイルを編集します。\n"
+"インテラクティブなエディターで既存の接続プロファイルを編集します。\n"
"プロファイルは名前、UUID、D-Bus パスなどで識別します。\n"
"\n"
"引数 := [type <新しい接続タイプ>] [con-name <新しい接続名>]\n"
@@ -776,7 +843,7 @@ msgstr ""
"インテラクティブなエディターで新しい接続プロファイルを追加します。\n"
"\n"
-#: ../clients/cli/connections.c:439
+#: ../clients/cli/connections.c:957
#, c-format
msgid ""
"Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -795,7 +862,7 @@ msgstr ""
"プロファイルは名前、UUID、D-Bus パスで識別します。\n"
"\n"
-#: ../clients/cli/connections.c:450
+#: ../clients/cli/connections.c:968
#, c-format
msgid ""
"Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -816,7 +883,7 @@ msgstr ""
"何も指定されない場合は、すべての接続プロファイルを監視します。\n"
"\n"
-#: ../clients/cli/connections.c:462
+#: ../clients/cli/connections.c:980
#, c-format
msgid ""
"Usage: nmcli connection reload { help }\n"
@@ -828,7 +895,7 @@ msgstr ""
"\n"
"ディスクからすべての接続ファイルを再読み込みします。\n"
-#: ../clients/cli/connections.c:470
+#: ../clients/cli/connections.c:988
#, c-format
msgid ""
"Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -850,7 +917,7 @@ msgstr ""
"NetworkManager に最新の状態を認識させてください。\n"
"\n"
-#: ../clients/cli/connections.c:482
+#: ../clients/cli/connections.c:1000
#, c-format
msgid ""
"Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -874,7 +941,7 @@ msgstr ""
"NetworkManager VPN プラグインによりインポートされます。\n"
"\n"
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:1013
#, c-format
msgid ""
"Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -893,441 +960,337 @@ msgstr ""
"データは標準出力またはファイル (名前が指定された場合) に送信されます。\n"
"\n"
-#: ../clients/cli/connections.c:525
-msgid "activating"
-msgstr "アクティベート中"
-
-#: ../clients/cli/connections.c:527
-msgid "activated"
-msgstr "アクティベート済み"
-
-#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
-msgid "deactivating"
-msgstr "停止中"
-
-#: ../clients/cli/connections.c:531
-msgid "deactivated"
-msgstr "停止しました"
-
-#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
-#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
-#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
-#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
-#: ../clients/common/nm-client-utils.c:250
-#: ../clients/common/nm-client-utils.c:266
-#: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:1479
-#: ../clients/common/nm-meta-setting-desc.c:1547
-#: ../clients/common/nm-meta-setting-desc.c:2692
-#: ../clients/common/nm-meta-setting-desc.c:2746
-msgid "unknown"
-msgstr "不明"
-
-#: ../clients/cli/connections.c:543
-msgid "VPN connecting (prepare)"
-msgstr "VPN 接続（準備）"
-
-#: ../clients/cli/connections.c:545
-msgid "VPN connecting (need authentication)"
-msgstr "VPN 接続（認証が必要）"
-
-#: ../clients/cli/connections.c:547
-msgid "VPN connecting"
-msgstr "VPN 接続"
-
-#: ../clients/cli/connections.c:549
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN 接続（IP 設定を取得）"
-
-#: ../clients/cli/connections.c:551
-msgid "VPN connected"
-msgstr "VPN 接続済み"
-
-#: ../clients/cli/connections.c:553
-msgid "VPN connection failed"
-msgstr "VPN 接続失敗"
-
-#: ../clients/cli/connections.c:555
-msgid "VPN disconnected"
-msgstr "VPN 切断済み"
-
-#: ../clients/cli/connections.c:625
+#: ../clients/cli/connections.c:1095
#, c-format
msgid "Error updating secrets for %s: %s\n"
msgstr "%s のシークレットの更新中にエラーが発生しました: %s\n"
-#: ../clients/cli/connections.c:645
+#: ../clients/cli/connections.c:1138
msgid "Connection profile details"
msgstr "接続プロファイルの詳細"
-#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
+#: ../clients/cli/connections.c:1151 ../clients/cli/connections.c:1249
#, c-format
msgid "Error: 'connection show': %s"
msgstr "エラー: 'connection show': %s"
-#: ../clients/cli/connections.c:876
-msgid "never"
-msgstr "しない"
-
-#. "CAPABILITIES"
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
-#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
-#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
-#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
-#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
-#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
-#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
-#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
-#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
-#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
-#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
-#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
-#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
-#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2685
-msgid "yes"
-msgstr "はい"
-
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
-#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
-#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
-#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
-#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
-#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
-#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
-#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
-#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
-#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
-#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
-#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
-#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
-#: ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2688
-msgid "no"
-msgstr "いいえ"
-
-#: ../clients/cli/connections.c:1098
+#: ../clients/cli/connections.c:1239
msgid "Activate connection details"
msgstr "アクティブな接続の詳細"
-#: ../clients/cli/connections.c:1345
+#: ../clients/cli/connections.c:1485
#, c-format
msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
msgstr ""
"無効なフィールド '%s'; 使用できるフィールド: %s および %s、または %s、%s"
-#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
+#: ../clients/cli/connections.c:1500 ../clients/cli/connections.c:1508
#, c-format
msgid "'%s' has to be alone"
msgstr "'%s' は孤立させる必要があります"
-#: ../clients/cli/connections.c:1568
+#: ../clients/cli/connections.c:1773
#, c-format
msgid "incorrect string '%s' of '--order' option"
msgstr "'--order' オプションの正しくない文字列 '%s'"
-#: ../clients/cli/connections.c:1594
+#: ../clients/cli/connections.c:1798
#, c-format
msgid "incorrect item '%s' in '--order' option"
msgstr "'--order' オプションの正しくないアイテム '%s'"
-#: ../clients/cli/connections.c:1624
+#: ../clients/cli/connections.c:1836
msgid "No connection specified"
msgstr "接続が指定されていません。"
-#: ../clients/cli/connections.c:1639
+#: ../clients/cli/connections.c:1847
#, c-format
msgid "%s argument is missing"
msgstr "%s 引数がありません。"
-#: ../clients/cli/connections.c:1649
+#: ../clients/cli/connections.c:1865
#, c-format
msgid "unknown connection '%s'"
msgstr "不明な接続 '%s'"
-#: ../clients/cli/connections.c:1682
+#: ../clients/cli/connections.c:1894
msgid "'--order' argument is missing"
msgstr "'--order' 引数がありません"
-#: ../clients/cli/connections.c:1737
+#: ../clients/cli/connections.c:1955
msgid "NetworkManager active profiles"
msgstr "NetworkManager のアクティブなプロファイル"
-#: ../clients/cli/connections.c:1738
+#: ../clients/cli/connections.c:1956
msgid "NetworkManager connection profiles"
msgstr "NetworkManager 接続プロファイル"
-#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
-#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
-#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
-#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
-#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
-#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
-#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
-#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
-#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
-#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
-#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/connections.c:2008 ../clients/cli/connections.c:2707
+#: ../clients/cli/connections.c:2719 ../clients/cli/connections.c:2731
+#: ../clients/cli/connections.c:2957 ../clients/cli/connections.c:8644
+#: ../clients/cli/connections.c:8660 ../clients/cli/devices.c:2849
+#: ../clients/cli/devices.c:2861 ../clients/cli/devices.c:2874
+#: ../clients/cli/devices.c:3025 ../clients/cli/devices.c:3036
+#: ../clients/cli/devices.c:3054 ../clients/cli/devices.c:3063
+#: ../clients/cli/devices.c:3084 ../clients/cli/devices.c:3095
+#: ../clients/cli/devices.c:3113 ../clients/cli/devices.c:3493
+#: ../clients/cli/devices.c:3503 ../clients/cli/devices.c:3511
+#: ../clients/cli/devices.c:3523 ../clients/cli/devices.c:3538
+#: ../clients/cli/devices.c:3546 ../clients/cli/devices.c:3720
+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3902
#, c-format
msgid "Error: %s argument is missing."
msgstr "エラー: %s 引数がありません。"
-#: ../clients/cli/connections.c:1810
+#: ../clients/cli/connections.c:2036
#, c-format
msgid "Error: %s - no such connection profile."
msgstr "エラー: %s - そのような接続プロファイルはありません。"
-#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
-#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
-#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
-#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
-#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
-#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
-#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
+#: ../clients/cli/connections.c:2127 ../clients/cli/connections.c:2694
+#: ../clients/cli/connections.c:2758 ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8274 ../clients/cli/connections.c:8760
+#: ../clients/cli/devices.c:1570 ../clients/cli/devices.c:1856
+#: ../clients/cli/devices.c:2025 ../clients/cli/devices.c:2133
+#: ../clients/cli/devices.c:2322 ../clients/cli/devices.c:3683
+#: ../clients/cli/devices.c:3908 ../clients/cli/general.c:914
#, c-format
msgid "Error: %s."
msgstr "エラー: %s."
-#: ../clients/cli/connections.c:1972
+#: ../clients/cli/connections.c:2220
#, c-format
msgid "no active connection on device '%s'"
msgstr "デバイス '%s' 上にアクティブな接続はありません"
-#: ../clients/cli/connections.c:1980
+#: ../clients/cli/connections.c:2228
msgid "no active connection or device"
msgstr "アクティブな接続またはデバイスがありません"
-#: ../clients/cli/connections.c:2000
+#: ../clients/cli/connections.c:2248
#, c-format
msgid "device '%s' not compatible with connection '%s':"
msgstr "デバイス '%s' は接続 '%s' と互換性がありません:"
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2281
#, c-format
msgid "device '%s' not compatible with connection '%s'"
msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
-#: ../clients/cli/connections.c:2039
+#: ../clients/cli/connections.c:2284
#, c-format
msgid "no device found for connection '%s'"
msgstr "接続 '%s'用のデバイスが見つかりません"
-#: ../clients/cli/connections.c:2067
+#: ../clients/cli/connections.c:2316
#, c-format
msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
msgstr "接続が正常にアクティベートされました (%s) (D-Bus アクティブパス: %s)\n"
-#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
-#: ../clients/cli/connections.c:6244
+#: ../clients/cli/connections.c:2320 ../clients/cli/connections.c:2468
+#: ../clients/cli/connections.c:6534
#, c-format
msgid "Connection successfully activated (D-Bus active path: %s)\n"
msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
-#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
+#: ../clients/cli/connections.c:2327 ../clients/cli/connections.c:2448
#, c-format
msgid "Error: Connection activation failed: %s"
msgstr "エラー: 接続のアクティベーションに失敗: %s"
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2363
#, c-format
msgid "Error: Timeout expired (%d seconds)"
msgstr "エラー: タイムアウト (%d 秒) になりました"
-#: ../clients/cli/connections.c:2280
+#: ../clients/cli/connections.c:2530
#, c-format
msgid "failed to read passwd-file '%s': %s"
msgstr "passwd-file '%s'の読み込みに失敗: %s"
-#: ../clients/cli/connections.c:2292
+#: ../clients/cli/connections.c:2543
#, c-format
msgid "missing colon in 'password' entry '%s'"
msgstr "'password' エントリー '%s' にコロンがありません"
-#: ../clients/cli/connections.c:2300
+#: ../clients/cli/connections.c:2551
#, c-format
msgid "missing dot in 'password' entry '%s'"
msgstr "'password' エントリー '%s' にドットがありません"
-#: ../clients/cli/connections.c:2313
+#: ../clients/cli/connections.c:2564
#, c-format
msgid "invalid setting name in 'password' entry '%s'"
msgstr "'password' エントリー '%s' の設定名が無効です"
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2610
#, c-format
msgid "unknown device '%s'."
msgstr "不明なデバイス '%s' です。"
-#: ../clients/cli/connections.c:2374
+#: ../clients/cli/connections.c:2615
msgid "neither a valid connection nor device given"
msgstr "有効な接続、デバイスいずれも指定されていません"
-#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
-#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
-#: ../clients/cli/devices.c:3641
+#: ../clients/cli/connections.c:2741 ../clients/cli/devices.c:1521
+#: ../clients/cli/devices.c:2906 ../clients/cli/devices.c:3126
+#: ../clients/cli/devices.c:3737
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "不明なパラメーター: %s\n"
-#: ../clients/cli/connections.c:2525
+#: ../clients/cli/connections.c:2766
msgid "preparing"
msgstr "準備中"
-#: ../clients/cli/connections.c:2545
+#: ../clients/cli/connections.c:2874
#, c-format
msgid "Connection '%s' (%s) successfully deleted.\n"
msgstr "接続 '%s' (%s) が正常に削除されました。\n"
-#: ../clients/cli/connections.c:2561
+#: ../clients/cli/connections.c:2890
#, c-format
msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
msgstr ""
"接続 '%s' が正常に非アクティブ化されました (D-Bus アクティブパス: %s)\n"
-#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
-#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
+#: ../clients/cli/connections.c:2939 ../clients/cli/connections.c:8381
+#: ../clients/cli/connections.c:8412 ../clients/cli/connections.c:8570
#, c-format
msgid "Error: No connection specified."
msgstr "エラー: 接続が指定されていません。"
-#: ../clients/cli/connections.c:2683
+#: ../clients/cli/connections.c:2969
#, c-format
msgid "Error: '%s' is not an active connection.\n"
msgstr "エラー: '%s' はアクティブな接続ではありません。\n"
-#: ../clients/cli/connections.c:2684
+#: ../clients/cli/connections.c:2970
#, c-format
msgid "Error: not all active connections found."
msgstr "エラー: アクティブな一部の接続が見つかりません。"
-#: ../clients/cli/connections.c:2693
+#: ../clients/cli/connections.c:2978
#, c-format
msgid "Error: no active connection provided."
msgstr "エラー: アクティブな接続がありません。"
-#: ../clients/cli/connections.c:2727
+#: ../clients/cli/connections.c:3009
#, c-format
msgid "Connection '%s' deactivation failed: %s\n"
msgstr "接続 '%s' の非アクティブ化に失敗しました: %s\n"
-#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
-#: ../clients/common/nm-client-utils.c:169
+#: ../clients/cli/connections.c:3260 ../clients/cli/connections.c:3317
+#: ../clients/common/nm-client-utils.c:221
#, c-format
msgid "'%s' not among [%s]"
msgstr "'%s' は [%s] にはありません"
#. We should not really come here
-#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
-#: ../clients/common/nm-client-utils.c:279
+#: ../clients/cli/connections.c:3280 ../clients/cli/connections.c:3340
+#: ../clients/common/nm-client-utils.c:320
#, c-format
msgid "Unknown error"
msgstr "不明なエラー"
-#: ../clients/cli/connections.c:3197
+#: ../clients/cli/connections.c:3474
#, c-format
msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
msgstr "警告: master='%s' は既存のプロファイルを参照しません。\n"
-#: ../clients/cli/connections.c:3534
+#: ../clients/cli/connections.c:3811
#, c-format
msgid "Error: invalid property '%s': %s."
-msgstr "エラー: 無効なプロパティ '%s': %s。"
+msgstr "エラー: 無効なプロパティー '%s': %s。"
-#: ../clients/cli/connections.c:3551
+#: ../clients/cli/connections.c:3828
#, c-format
msgid "Error: failed to modify %s.%s: %s."
msgstr "エラー: %s.%s の変更に失敗しました: %s。"
-#: ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3848
#, c-format
msgid "Error: failed to remove a value from %s.%s: %s."
msgstr "エラー: '%s' の値の削除に失敗しました、%s: %s。"
-#: ../clients/cli/connections.c:3604
+#: ../clients/cli/connections.c:3882
#, c-format
msgid "Error: '%s' is mandatory."
msgstr "エラー: '%s' は必須です。"
-#: ../clients/cli/connections.c:3631
+#: ../clients/cli/connections.c:3909
#, c-format
msgid "Error: invalid slave type; %s."
msgstr "エラー: 無効なスレーブタイプ; %s。"
-#: ../clients/cli/connections.c:3639
+#: ../clients/cli/connections.c:3917
#, c-format
msgid "Error: invalid connection type; %s."
msgstr "エラー: 無効な接続タイプ; %s。"
-#: ../clients/cli/connections.c:3716
+#: ../clients/cli/connections.c:3994
#, c-format
msgid "Error: bad connection type: %s"
msgstr "エラー: 問題のある接続タイプ: %s"
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:4040
#, c-format
msgid "Error: '%s': %s"
msgstr "エラー: '%s': %s"
-#: ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:4061
msgid "Error: master is required"
msgstr "エラー: マスターが必要です"
-#: ../clients/cli/connections.c:3842
+#: ../clients/cli/connections.c:4120
#, c-format
msgid "Error: error adding bond option '%s=%s'."
msgstr "エラー: ボンドオプション '%s=%s' の追加中にエラー。"
-#: ../clients/cli/connections.c:3873
+#: ../clients/cli/connections.c:4151
#, 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:3904
+#: ../clients/cli/connections.c:4182
#, c-format
msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
msgstr ""
"エラー: 'bt-type': '%s' は無効です。[%s, %s, %s (%s), %s] を使用してくださ"
"い。"
-#: ../clients/cli/connections.c:4153
+#: ../clients/cli/connections.c:4431
#, c-format
msgid "Error: value for '%s' is missing."
msgstr "エラー: '%s' の値が不明です。"
-#: ../clients/cli/connections.c:4199
+#: ../clients/cli/connections.c:4477
msgid "Error: <setting>.<property> argument is missing."
msgstr "エラー: <setting>.<property> 引数がありません。"
-#: ../clients/cli/connections.c:4222
+#: ../clients/cli/connections.c:4500
#, c-format
msgid "Error: invalid or not allowed setting '%s': %s."
msgstr "エラー: 無効または許可されていない設定 '%s' です: %s。"
-#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
+#: ../clients/cli/connections.c:4546 ../clients/cli/connections.c:4562
#, c-format
msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
msgstr "エラー:'%s' があいまいです (%s.%s または %s.%s)。"
-#: ../clients/cli/connections.c:4302
+#: ../clients/cli/connections.c:4580
#, c-format
msgid "Error: invalid <setting>.<property> '%s'."
msgstr "エラー: 無効な <setting>.<property> '%s' です。"
-#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
+#: ../clients/cli/connections.c:4624 ../clients/cli/connections.c:8214
#, c-format
msgid "Error: Failed to add '%s' connection: %s"
msgstr "エラー: '%s' 接続の追加に失敗しました: %s"
-#: ../clients/cli/connections.c:4364
+#: ../clients/cli/connections.c:4642
#, c-format
msgid ""
"Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1339,12 +1302,47 @@ msgstr[0] ""
"警告: 名前が '%1$s' の接続が他に %3$u 個あります。uuid が '%2$s' の接続を参照"
"してください。\n"
-#: ../clients/cli/connections.c:4373
+#: ../clients/cli/connections.c:4651
#, c-format
msgid "Connection '%s' (%s) successfully added.\n"
msgstr "接続 '%s' (%s) が正常に追加されました。\n"
-#: ../clients/cli/connections.c:4511
+#: ../clients/cli/connections.c:4704 ../clients/cli/connections.c:6651
+#: ../clients/cli/connections.c:6652 ../clients/cli/devices.c:876
+#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
+#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
+#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
+#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
+#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
+#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:157
+#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2676
+msgid "no"
+msgstr "いいえ"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:4705 ../clients/cli/connections.c:6651
+#: ../clients/cli/connections.c:6652 ../clients/cli/devices.c:876
+#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
+#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
+#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
+#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
+#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
+#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:156
+#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2673
+msgid "yes"
+msgstr "はい"
+
+#: ../clients/cli/connections.c:4789
#, c-format
msgid ""
"You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1353,34 +1351,34 @@ msgstr ""
"さい。\n"
#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4610
+#: ../clients/cli/connections.c:4888
#, c-format
msgid "There is %d optional setting for %s.\n"
msgid_plural "There are %d optional settings for %s.\n"
msgstr[0] "%2$s には、任意の設定が %1$d 個あります。\n"
-#: ../clients/cli/connections.c:4613
+#: ../clients/cli/connections.c:4891
#, c-format
msgid "Do you want to provide it? %s"
msgid_plural "Do you want to provide them? %s"
msgstr[0] "指定しますか? %s"
-#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
+#: ../clients/cli/connections.c:5024 ../clients/cli/utils.c:292
#, c-format
msgid "Error: value for '%s' argument is required."
msgstr "エラー: '%s' 引数の値が必要です。"
-#: ../clients/cli/connections.c:4755
+#: ../clients/cli/connections.c:5031
#, c-format
msgid "Error: 'save': %s."
msgstr "エラー: 'save': %s。"
-#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
+#: ../clients/cli/connections.c:5117 ../clients/cli/connections.c:5128
#, c-format
msgid "Error: '%s' argument is required."
msgstr "エラー: '%s' 引数が必要です。"
-#: ../clients/cli/connections.c:5832
+#: ../clients/cli/connections.c:6093
#, c-format
msgid "['%s' setting values]\n"
msgstr "['%s' 設定値]\n"
@@ -1388,7 +1386,7 @@ msgstr "['%s' 設定値]\n"
#. TRANSLATORS: do not translate command names and keywords before ::
#. * However, you should translate terms enclosed in <>.
#.
-#: ../clients/cli/connections.c:5911
+#: ../clients/cli/connections.c:6202
#, c-format
msgid ""
"---[ Main menu ]---\n"
@@ -1421,7 +1419,7 @@ msgstr ""
"nmcli <conf-option> <value> :: nmcli 設定\n"
"quit :: nmcli を終了する\n"
-#: ../clients/cli/connections.c:5938
+#: ../clients/cli/connections.c:6229
#, c-format
msgid ""
"goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
@@ -1440,7 +1438,7 @@ msgstr ""
" nmcli connection> goto secondaries\n"
" nmcli> goto ipv4.addresses\n"
-#: ../clients/cli/connections.c:5945
+#: ../clients/cli/connections.c:6236
#, c-format
msgid ""
"remove <setting>[.<prop>] :: remove setting or reset property value\n"
@@ -1461,7 +1459,7 @@ msgstr ""
"例: nmcli> remove wifi-sec\n"
" nmcli> remove eth.mtu\n"
-#: ../clients/cli/connections.c:5952
+#: ../clients/cli/connections.c:6243
#, c-format
msgid ""
"set [<setting>.<prop> <value>] :: set property value\n"
@@ -1476,7 +1474,7 @@ msgstr ""
"\n"
"例: nmcli> set con.id My connection\n"
-#: ../clients/cli/connections.c:5957
+#: ../clients/cli/connections.c:6248
#, c-format
msgid ""
"describe [<setting>.<prop>] :: describe property\n"
@@ -1489,7 +1487,7 @@ msgstr ""
"プロパティー詳細を表示します。NM の設定およびプロパティーの全詳細については、"
"nm-settings(5) の man ページを参照してください。\n"
-#: ../clients/cli/connections.c:5962
+#: ../clients/cli/connections.c:6253
#, c-format
msgid ""
"print [all] :: print setting or connection values\n"
@@ -1504,7 +1502,7 @@ msgstr ""
"\n"
"例: nmcli ipv4> print all\n"
-#: ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:6258
#, c-format
msgid ""
"verify [all | fix] :: verify setting or connection validity\n"
@@ -1529,7 +1527,7 @@ msgstr ""
" nmcli> verify fix\n"
" nmcli bond> verify\n"
-#: ../clients/cli/connections.c:5976
+#: ../clients/cli/connections.c:6267
#, c-format
msgid ""
"save [persistent|temporary] :: save the connection\n"
@@ -1550,12 +1548,12 @@ msgstr ""
"メモリーにのみ保持します。引数がない 'save' は 'save persistent' を\n"
"意味します。\n"
"プロファイルを永続的に保存すると、これらの設定は、再起動しても\n"
-"保持されます。以降の変更も一時的または永続的に行なえますが\n"
+"保持されます。以降の変更も一時的または永続的に行えますが\n"
"一時的な変更は再起動後に保持されません。\n"
"永続的な接続を完全に削除する場合は、接続プロファイルを削除する\n"
"必要があります。\n"
-#: ../clients/cli/connections.c:5987
+#: ../clients/cli/connections.c:6278
#, c-format
msgid ""
"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
@@ -1576,7 +1574,7 @@ msgstr ""
"/<ap>|<nsp> - AP (Wi-Fi) または NSP (WiMAX) (<ifname> が指定されていない場合"
"は / を先頭に付ける)\n"
-#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
+#: ../clients/cli/connections.c:6285 ../clients/cli/connections.c:6443
#, c-format
msgid ""
"back :: go to upper menu level\n"
@@ -1585,7 +1583,7 @@ msgstr ""
"back :: 一つ上のメニューレベルに移動\n"
"\n"
-#: ../clients/cli/connections.c:5997
+#: ../clients/cli/connections.c:6288
#, c-format
msgid ""
"help/? [<command>] :: help for the nmcli commands\n"
@@ -1594,7 +1592,7 @@ msgstr ""
"help/? [<command>] :: nmcli コマンドのヘルプ\n"
"\n"
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:6291
#, c-format
msgid ""
"nmcli [<conf-option> <value>] :: nmcli configuration\n"
@@ -1621,7 +1619,7 @@ msgstr ""
" nmcli> nmcli save-confirmation no\n"
" nmcli> nmcli prompt-color 3\n"
-#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
+#: ../clients/cli/connections.c:6313 ../clients/cli/connections.c:6449
#, c-format
msgid ""
"quit :: exit nmcli\n"
@@ -1634,8 +1632,8 @@ msgstr ""
"nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が"
"求められます。\n"
-#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
-#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
+#: ../clients/cli/connections.c:6318 ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6873 ../clients/cli/connections.c:7800
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "不明なコマンド: '%s'\n"
@@ -1643,7 +1641,7 @@ msgstr "不明なコマンド: '%s'\n"
#. TRANSLATORS: do not translate command names and keywords before ::
#. * However, you should translate terms enclosed in <>.
#.
-#: ../clients/cli/connections.c:6093
+#: ../clients/cli/connections.c:6383
#, c-format
msgid ""
"---[ Property menu ]---\n"
@@ -1669,7 +1667,7 @@ msgstr ""
"help/? [<command>] :: このヘルプまたはコマンドの詳細を表示\n"
"quit :: nmcli の終了\n"
-#: ../clients/cli/connections.c:6118
+#: ../clients/cli/connections.c:6408
#, c-format
msgid ""
"set [<value>] :: set new value\n"
@@ -1680,7 +1678,7 @@ msgstr ""
"\n"
"このプロパティーに指定した <value> を設定します。\n"
-#: ../clients/cli/connections.c:6122
+#: ../clients/cli/connections.c:6412
#, c-format
msgid ""
"add [<value>] :: append new value to the property\n"
@@ -1695,7 +1693,7 @@ msgstr ""
"<value> がこのプロパティーに追加されます。単一値のプロパティーの場合は、その"
"プロパティー値が置換されます ('set' の場合と同じ)。\n"
-#: ../clients/cli/connections.c:6128
+#: ../clients/cli/connections.c:6418
#, c-format
msgid ""
"change :: change current value\n"
@@ -1706,7 +1704,7 @@ msgstr ""
"\n"
"現在の値を表示し、その値を変更することができます。\n"
-#: ../clients/cli/connections.c:6132
+#: ../clients/cli/connections.c:6422
#, c-format
msgid ""
"remove [<value>|<index>|<option name>] :: delete the value\n"
@@ -1741,7 +1739,7 @@ msgstr ""
" nmcli bond.options> remove downdelay\n"
"\n"
-#: ../clients/cli/connections.c:6143
+#: ../clients/cli/connections.c:6433
#, c-format
msgid ""
"describe :: describe property\n"
@@ -1754,7 +1752,7 @@ msgstr ""
"プロパティーの詳細を表示します。NM 設定とプロパティーの詳細は、nm-"
"settings(5) man ページを参照してください。\n"
-#: ../clients/cli/connections.c:6148
+#: ../clients/cli/connections.c:6438
#, c-format
msgid ""
"print [property|setting|connection] :: print property (setting, connection) "
@@ -1768,7 +1766,7 @@ msgstr ""
"プロパティー値を表示します。引数を指定すると、設定または接続全体の値を表示さ"
"せることもできます。\n"
-#: ../clients/cli/connections.c:6156
+#: ../clients/cli/connections.c:6446
#, c-format
msgid ""
"help/? [<command>] :: help for nmcli commands\n"
@@ -1777,96 +1775,96 @@ msgstr ""
"help/? [<command>] :: nmcli コマンドのヘルプ\n"
"\n"
-#: ../clients/cli/connections.c:6250
+#: ../clients/cli/connections.c:6540
#, c-format
msgid "Error: Connection activation failed.\n"
msgstr "エラー: 接続のアクティベートに失敗しました。\n"
-#: ../clients/cli/connections.c:6345
+#: ../clients/cli/connections.c:6631
#, 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:6363
+#: ../clients/cli/connections.c:6649
#, c-format
msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
msgstr "[ タイプ: %s | 名前: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-#: ../clients/cli/connections.c:6399
+#: ../clients/cli/connections.c:6685
#, c-format
msgid "The connection is not saved. Do you really want to quit? %s"
msgstr "この接続は保存されません。本当に終了しますか? %s"
-#: ../clients/cli/connections.c:6448
+#: ../clients/cli/connections.c:6731
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
"'save' in the main menu to restore it.\n"
msgstr ""
"この接続プロファイルは別のクライアントからは削除されています。メインメニュー"
-"で「save」と入力すると元に戻すことができます。\n"
+"で 'save' と入力すると元に戻すことができます。\n"
-#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
-#: ../clients/cli/connections.c:6950
+#: ../clients/cli/connections.c:6762 ../clients/cli/connections.c:7154
+#: ../clients/cli/connections.c:7212
#, c-format
msgid "Allowed values for '%s' property: %s\n"
msgstr "'%s' プロパティーに使用できる値: %s\n"
-#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
-#: ../clients/cli/connections.c:6953
+#: ../clients/cli/connections.c:6765 ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:7215
#, c-format
msgid "Enter '%s' value: "
msgstr "'%s' 値を入力してください: "
-#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
-#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
+#: ../clients/cli/connections.c:6779 ../clients/cli/connections.c:6799
+#: ../clients/cli/connections.c:7161 ../clients/cli/connections.c:7220
#, c-format
msgid "Error: failed to set '%s' property: %s\n"
msgstr "エラー: '%s' プロパティーの設定に失敗しました: %s\n"
-#: ../clients/cli/connections.c:6512
+#: ../clients/cli/connections.c:6793
#, c-format
msgid "Edit '%s' value: "
msgstr "'%s' 値の編集: "
-#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
+#: ../clients/cli/connections.c:6819 ../clients/cli/settings.c:394
#, c-format
msgid "Error: %s\n"
msgstr "エラー: %s\n"
-#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
-#: ../clients/cli/connections.c:7104
+#: ../clients/cli/connections.c:6825 ../clients/cli/connections.c:7315
+#: ../clients/cli/connections.c:7366
#, c-format
msgid "Error: failed to remove value of '%s': %s\n"
msgstr "エラー: '%s' の値の削除に失敗しました: %s\n"
-#: ../clients/cli/connections.c:6568
+#: ../clients/cli/connections.c:6846
#, c-format
msgid "Unknown command argument: '%s'\n"
msgstr "不明なコマンド引数: '%s'\n"
-#: ../clients/cli/connections.c:6671
+#: ../clients/cli/connections.c:6936
#, c-format
msgid "Available settings: %s\n"
msgstr "使用可能な設定: %s\n"
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6948
#, c-format
msgid "Error: invalid setting name; %s\n"
msgstr "エラー: 無効な設定名; %s\n"
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:6965
#, c-format
msgid "Available properties: %s\n"
-msgstr "使用可能なプロパティ: %s\n"
+msgstr "利用可能なプロパティー: %s\n"
-#: ../clients/cli/connections.c:6708
+#: ../clients/cli/connections.c:6973
#, c-format
msgid "Error: property %s\n"
-msgstr "エラー: プロパティ %s\n"
+msgstr "エラー: プロパティー %s\n"
-#: ../clients/cli/connections.c:6749
+#: ../clients/cli/connections.c:7014
#, c-format
msgid ""
"Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1877,424 +1875,422 @@ msgstr ""
"ベートされる可能性があります。\n"
"本当に保存しますか? %s"
-#: ../clients/cli/connections.c:6832
+#: ../clients/cli/connections.c:7093
#, c-format
msgid "You may edit the following settings: %s\n"
msgstr "次の設定を変更することができます: %s\n"
-#: ../clients/cli/connections.c:6862
+#: ../clients/cli/connections.c:7122
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
"'save' to restore it.\n"
msgstr ""
-"この接続プロファイルは別のクライアントからは削除されています。「save」と入力"
-"すると元に戻すことができます。\n"
+"この接続プロファイルは別のクライアントからは削除されています。'save' と入力す"
+"ると元に戻すことができます。\n"
-#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
-#: ../clients/cli/connections.c:7180
+#: ../clients/cli/connections.c:7165 ../clients/cli/connections.c:7410
+#: ../clients/cli/connections.c:7442
#, c-format
msgid "Error: no setting selected; valid are [%s]\n"
msgstr "エラー: 設定が選択されていません。有効な設定は [%s] になります\n"
-#: ../clients/cli/connections.c:6904
+#: ../clients/cli/connections.c:7166
#, c-format
msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
msgstr ""
"まず先に 'goto <setting>' を使用するか、'set <setting>.<property>' を使用して"
"ください。\n"
-#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
-#: ../clients/cli/connections.c:7170
+#: ../clients/cli/connections.c:7181 ../clients/cli/connections.c:7342
+#: ../clients/cli/connections.c:7432
#, c-format
msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
msgstr "エラー: 無効な設定引数 %s です。[%s] が有効な引数になります\n"
-#: ../clients/cli/connections.c:6928
+#: ../clients/cli/connections.c:7190
#, c-format
msgid "Error: missing setting for '%s' property\n"
msgstr "エラー: '%s' プロパティー用の設定がありません\n"
-#: ../clients/cli/connections.c:6935
+#: ../clients/cli/connections.c:7197
#, c-format
msgid "Error: invalid property: %s\n"
msgstr "エラー: 無効なプロパティー: %s\n"
-#: ../clients/cli/connections.c:6989
+#: ../clients/cli/connections.c:7251
#, c-format
msgid "Error: unknown setting '%s'\n"
msgstr "エラー: 不明な設定 '%s'\n"
-#: ../clients/cli/connections.c:7014
+#: ../clients/cli/connections.c:7276
#, c-format
msgid "You may edit the following properties: %s\n"
msgstr "変更できるのは次のプロパティーになります: %s\n"
-#: ../clients/cli/connections.c:7058
+#: ../clients/cli/connections.c:7320
#, c-format
msgid "Error: no argument given; valid are [%s]\n"
msgstr "エラー: 引数が指定されていません。[%s] が有効な引数になります\n"
-#: ../clients/cli/connections.c:7077
+#: ../clients/cli/connections.c:7339
#, c-format
msgid "Setting '%s' is not present in the connection.\n"
msgstr "この接続には、設定 '%s' はありません。\n"
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7387
#, c-format
msgid "Error: %s properties, nor it is a setting name.\n"
msgstr "エラー: %s プロパティー、設定名でもありません。\n"
-#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
+#: ../clients/cli/connections.c:7411 ../clients/cli/connections.c:7443
#, c-format
msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
msgstr ""
"まず先に 'goto <setting>' を使用するか、'describe <setting>.<property>' を使"
"用してください\n"
-#: ../clients/cli/connections.c:7204
+#: ../clients/cli/connections.c:7466
#, c-format
msgid "Error: invalid property: %s, neither a valid setting name.\n"
msgstr "エラー: 無効なプロパティー: %s、有効な設定名でもありません。\n"
-#: ../clients/cli/connections.c:7234
+#: ../clients/cli/connections.c:7496
#, c-format
msgid "Error: unknown setting: '%s'\n"
msgstr "エラー: 不明な設定: '%s'\n"
-#: ../clients/cli/connections.c:7239
+#: ../clients/cli/connections.c:7501
#, c-format
msgid "Error: '%s' setting not present in the connection\n"
msgstr "エラー: この接続には、設定 '%s' がありません。\n"
-#: ../clients/cli/connections.c:7270
+#: ../clients/cli/connections.c:7532
#, c-format
msgid "Error: invalid property: %s%s\n"
msgstr "エラー: 無効なプロパティー: %s%s\n"
-#: ../clients/cli/connections.c:7272
+#: ../clients/cli/connections.c:7534
msgid ", neither a valid setting name"
msgstr "有効な設定名でもありません。"
-#: ../clients/cli/connections.c:7288
+#: ../clients/cli/connections.c:7550
#, c-format
msgid "Invalid verify option: %s\n"
msgstr "無効な検証オプション: %s\n"
-#: ../clients/cli/connections.c:7296
+#: ../clients/cli/connections.c:7558
#, c-format
msgid "Verify setting '%s': %s\n"
msgstr "設定 '%s' の確認: %s\n"
-#: ../clients/cli/connections.c:7311
+#: ../clients/cli/connections.c:7573
#, c-format
msgid "Verify connection: %s\n"
msgstr "接続の確認: %s\n"
-#: ../clients/cli/connections.c:7314
+#: ../clients/cli/connections.c:7576
#, c-format
msgid "The error cannot be fixed automatically.\n"
msgstr "エラーを自動的に修正できません。\n"
-#: ../clients/cli/connections.c:7331
+#: ../clients/cli/connections.c:7593
#, c-format
msgid "Error: invalid argument '%s'\n"
msgstr "エラー: 無効な引数 '%s'\n"
-#: ../clients/cli/connections.c:7363
+#: ../clients/cli/connections.c:7625
#, c-format
msgid "Error: Failed to save '%s' (%s) connection: %s\n"
msgstr "エラー: '%s' (%s) 接続の保存に失敗しました: %s\n"
-#: ../clients/cli/connections.c:7370
+#: ../clients/cli/connections.c:7632
#, c-format
msgid "Connection '%s' (%s) successfully saved.\n"
msgstr "接続 '%s' (%s) が正常に保存されました。\n"
-#: ../clients/cli/connections.c:7371
+#: ../clients/cli/connections.c:7633
#, c-format
msgid "Connection '%s' (%s) successfully updated.\n"
msgstr "接続 '%s' (%s) が正常に更新されました。\n"
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7665
#, c-format
msgid "Error: connection verification failed: %s\n"
msgstr "エラー: 接続の確認に失敗しました: %s\n"
-#: ../clients/cli/connections.c:7404
+#: ../clients/cli/connections.c:7666
msgid "(unknown error)"
msgstr "(不明なエラー)"
-#: ../clients/cli/connections.c:7405
+#: ../clients/cli/connections.c:7667
#, c-format
msgid "You may try running 'verify fix' to fix errors.\n"
msgstr "エラーを修正するために 'verify fix' の実行を試行できます。\n"
-#: ../clients/cli/connections.c:7427
+#: ../clients/cli/connections.c:7689
#, c-format
msgid "Error: connection is not saved. Type 'save' first.\n"
msgstr "エラー: 接続は保存されていません。まず 'save' と入力します。\n"
-#: ../clients/cli/connections.c:7431
+#: ../clients/cli/connections.c:7693
#, c-format
msgid "Error: connection is not valid: %s\n"
msgstr "エラー: 接続は無効です: %s\n"
-#: ../clients/cli/connections.c:7441
+#: ../clients/cli/connections.c:7703
#, c-format
msgid "Error: Cannot activate connection: %s.\n"
msgstr "エラー: 接続をアクティベートできません: %s。\n"
-#: ../clients/cli/connections.c:7450
+#: ../clients/cli/connections.c:7712
#, c-format
msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
msgstr "エラー: '%s' (%s) 接続のアクティベートに失敗しました: %s\n"
-#: ../clients/cli/connections.c:7456
+#: ../clients/cli/connections.c:7718
msgid "Monitoring connection activation (press any key to continue)\n"
msgstr "モニタリング接続のアクティベート (いずれかのキーを押して続行する)\n"
-#: ../clients/cli/connections.c:7492
+#: ../clients/cli/connections.c:7754
#, c-format
msgid "Error: status-line: %s\n"
msgstr "エラー: status-line: %s\n"
-#: ../clients/cli/connections.c:7500
+#: ../clients/cli/connections.c:7762
#, c-format
msgid "Error: save-confirmation: %s\n"
msgstr "エラー: save-confirmation: %s\n"
-#: ../clients/cli/connections.c:7508
+#: ../clients/cli/connections.c:7770
#, c-format
msgid "Error: show-secrets: %s\n"
msgstr "エラー: show-secrets: %s\n"
-#: ../clients/cli/connections.c:7517
-#, c-format
-msgid "Error: bad color: %s\n"
-msgstr "エラー: 不正な色: %s\n"
-
-#: ../clients/cli/connections.c:7532
+#: ../clients/cli/connections.c:7777
#, c-format
msgid "Current nmcli configuration:\n"
msgstr "現在の nmcli 設定:\n"
-#: ../clients/cli/connections.c:7542
+#: ../clients/cli/connections.c:7785
#, c-format
msgid "Invalid configuration option '%s'; allowed [%s]\n"
msgstr "無効な設定オプション '%s'; [%s] は指定できます\n"
-#: ../clients/cli/connections.c:7762
+#: ../clients/cli/connections.c:8003
#, c-format
-msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgstr "エラー: 指定できるのは 'id'、uuid、'path' のいずれか一つになります。"
+msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
+msgstr ""
+"エラー: 指定できるのは、'id'、'filename'、uuid、または 'path' のいずれか 1 つ"
+"になります。"
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
+#: ../clients/cli/connections.c:8017 ../clients/cli/connections.c:8175
#, c-format
msgid "Error: Unknown connection '%s'."
msgstr "エラー: 不明な接続 '%s' です。"
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:8033
#, c-format
msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr "警告: 既存の接続 '%s' を編集しています。'タイプ' 引数は無視されます\n"
+msgstr "警告: 既存の接続 '%s' を編集しています。'type' 引数は無視されます\n"
-#: ../clients/cli/connections.c:7798
+#: ../clients/cli/connections.c:8036
#, c-format
msgid ""
"Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr "警告: 既存の接続 '%s' を編集しています。'con 名' 引数は無視されます\n"
+msgstr ""
+"警告: 既存の接続 '%s' を編集しています。'con-name' 引数は無視されます\n"
-#: ../clients/cli/connections.c:7820
+#: ../clients/cli/connections.c:8063
#, c-format
msgid "Valid connection types: %s\n"
msgstr "有効な接続タイプ: %s\n"
-#: ../clients/cli/connections.c:7822
+#: ../clients/cli/connections.c:8065
#, c-format
msgid "Error: invalid connection type; %s\n"
msgstr "エラー: 無効な接続タイプ; %s\n"
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:8100
#, c-format
msgid "===| nmcli interactive connection editor |==="
msgstr "===| nmcli インテラクティブ接続エディター |==="
-#: ../clients/cli/connections.c:7865
+#: ../clients/cli/connections.c:8103
#, c-format
msgid "Editing existing '%s' connection: '%s'"
msgstr "既存の '%s' 接続を編集中: '%s'"
-#: ../clients/cli/connections.c:7867
+#: ../clients/cli/connections.c:8105
#, c-format
msgid "Adding a new '%s' connection"
msgstr "新規の '%s' 接続を追加中"
-#: ../clients/cli/connections.c:7869
+#: ../clients/cli/connections.c:8107
#, c-format
msgid "Type 'help' or '?' for available commands."
msgstr "使用できるコマンドを表示するには 'help' または '?' を入力します。"
-#: ../clients/cli/connections.c:7871
+#: ../clients/cli/connections.c:8109
#, c-format
msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
msgstr ""
"プロパティー詳細を表示するには、'describe [<setting>.<prop>]' を入力します。"
-#: ../clients/cli/connections.c:7906
+#: ../clients/cli/connections.c:8137
#, c-format
msgid "Error: Failed to modify connection '%s': %s"
msgstr "エラー: 接続 '%s' の変更に失敗しました: %s"
-#: ../clients/cli/connections.c:7913
+#: ../clients/cli/connections.c:8143
#, c-format
msgid "Connection '%s' (%s) successfully modified.\n"
msgstr "接続 '%s' (%s) が正常に変更されました。\n"
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8219
#, c-format
msgid "%s (%s) cloned as %s (%s).\n"
msgstr "%s (%s) が %s (%s) としてクローンされました。\n"
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:8284
msgid "New connection name: "
msgstr "新規の接続名:"
-#: ../clients/cli/connections.c:8062
+#: ../clients/cli/connections.c:8286
#, c-format
msgid "Error: <new name> argument is missing."
msgstr "エラー: <new name> 引数がありません。"
-#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
+#: ../clients/cli/connections.c:8291 ../clients/cli/connections.c:8771
#, c-format
msgid "Error: unknown extra argument: '%s'."
msgstr "エラー: 不明な追加の引数: '%s'。"
-#: ../clients/cli/connections.c:8119
+#: ../clients/cli/connections.c:8336
#, c-format
msgid "Error: not all connections deleted."
msgstr "エラー: 一部の接続が削除されていません。"
-#: ../clients/cli/connections.c:8120
+#: ../clients/cli/connections.c:8337
#, c-format
msgid "Error: Connection deletion failed: %s"
msgstr "エラー: 接続の削除に失敗しました: %s"
-#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
+#: ../clients/cli/connections.c:8393 ../clients/cli/connections.c:8514
#, c-format
msgid "Error: %s.\n"
msgstr "エラー: %s。\n"
-#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:8394 ../clients/cli/connections.c:8515
#, c-format
msgid "Error: not all connections found."
msgstr "エラー: 一部の接続が見つかりません。"
#. truncate trailing ", "
-#: ../clients/cli/connections.c:8225
+#: ../clients/cli/connections.c:8445
#, c-format
msgid "Error: cannot delete unknown connection(s): %s."
msgstr "エラー: 不明な接続を削除できません: %s。"
-#: ../clients/cli/connections.c:8237
+#: ../clients/cli/connections.c:8455
#, c-format
msgid "%s: connection profile changed\n"
msgstr "%s: 接続プロファイルが変更されました\n"
-#: ../clients/cli/connections.c:8263
+#: ../clients/cli/connections.c:8481
#, c-format
msgid "%s: connection profile created\n"
msgstr "%s: 接続プロファイルが作成されました\n"
-#: ../clients/cli/connections.c:8272
+#: ../clients/cli/connections.c:8490
#, c-format
msgid "%s: connection profile removed\n"
msgstr "%s: 接続プロファイルが削除されました\n"
-#: ../clients/cli/connections.c:8335
+#: ../clients/cli/connections.c:8552
#, c-format
msgid "Error: failed to reload connections: %s."
msgstr "エラー: 接続のリロードに失敗しました: %s。"
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8585
#, c-format
msgid "Error: failed to load connection: %s."
msgstr "エラー: 接続のロードに失敗しました: %s。"
-#: ../clients/cli/connections.c:8376
+#: ../clients/cli/connections.c:8593
#, c-format
msgid "Could not load file '%s'\n"
msgstr "'%s' ファイルを読み込めませんでした。\n"
-#: ../clients/cli/connections.c:8383
+#: ../clients/cli/connections.c:8600
msgid "File to import: "
msgstr "インポートするファイル:"
-#: ../clients/cli/connections.c:8414
+#: ../clients/cli/connections.c:8631
#, c-format
msgid "Error: No arguments provided."
msgstr "エラー: 引数がありません。"
-#: ../clients/cli/connections.c:8439
+#: ../clients/cli/connections.c:8654
#, c-format
msgid "Warning: 'type' already specified, ignoring extra one.\n"
msgstr "警告: 'type' はすでに指定されています。追加のものは無視されます。\n"
-#: ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:8668
#, c-format
msgid "Warning: 'file' already specified, ignoring extra one.\n"
msgstr "警告: 'file' はすでに指定されています。追加のものは無視されます。\n"
-#: ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:8670
#, c-format
msgid "Unknown parameter: %s"
msgstr "不明なパラメーター: %s"
-#: ../clients/cli/connections.c:8468
+#: ../clients/cli/connections.c:8681
#, c-format
msgid "Error: 'type' argument is required."
msgstr "エラー: 'type' 引数が必要です。"
-#: ../clients/cli/connections.c:8473
+#: ../clients/cli/connections.c:8685
#, c-format
msgid "Error: 'file' argument is required."
msgstr "エラー: 'file' 引数が必要です。"
-#: ../clients/cli/connections.c:8480
+#: ../clients/cli/connections.c:8691
#, c-format
msgid "Error: failed to find VPN plugin for %s."
msgstr "エラー: %s 用の VPN プラグインが見つかりません。"
-#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
+#: ../clients/cli/connections.c:8698 ../clients/cli/connections.c:8790
#, c-format
msgid "Error: failed to load VPN plugin: %s."
msgstr "エラー: VPN プラグインのロードに失敗しました: %s。"
-#: ../clients/cli/connections.c:8496
+#: ../clients/cli/connections.c:8705
#, c-format
msgid "Error: failed to import '%s': %s."
msgstr "エラー: '%s' のインポートに失敗しました: %s。"
-#: ../clients/cli/connections.c:8576
+#: ../clients/cli/connections.c:8777
msgid "Output file name: "
msgstr "出力ファイル名:"
-#: ../clients/cli/connections.c:8580
+#: ../clients/cli/connections.c:8781
#, c-format
msgid "Error: the connection is not VPN."
msgstr "エラー: 接続は VPN ではありません。"
-#: ../clients/cli/connections.c:8601
+#: ../clients/cli/connections.c:8803
#, c-format
msgid "Error: failed to create temporary file %s."
msgstr "エラー: 一時ファイル %s の作成に失敗しました。"
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8811
#, c-format
msgid "Error: failed to export '%s': %s."
msgstr "エラー: '%s' のエクスポートに失敗しました: %s。"
-#: ../clients/cli/connections.c:8621
+#: ../clients/cli/connections.c:8823
#, c-format
msgid "Error: failed to read temporary file '%s': %s."
msgstr "エラー: 一時ファイル '%s' の読み取りに失敗しました: %s。"
@@ -2308,7 +2304,7 @@ msgstr "インターフェース: "
msgid "Interface(s): "
msgstr "インターフェース: "
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:253
#, c-format
msgid ""
"Usage: nmcli device { COMMAND | help }\n"
@@ -2387,7 +2383,7 @@ msgstr ""
" lldp [list [ifname <ifname>]]\n"
"\n"
-#: ../clients/cli/devices.c:277
+#: ../clients/cli/devices.c:276
#, c-format
msgid ""
"Usage: nmcli device status { help }\n"
@@ -2418,7 +2414,7 @@ msgstr ""
"status' を実行したことになります。\n"
"\n"
-#: ../clients/cli/devices.c:292
+#: ../clients/cli/devices.c:291
#, c-format
msgid ""
"Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2437,7 +2433,7 @@ msgstr ""
"このコマンドですべてのデバイスまたは指定デバイスの詳細を表示させます。\n"
"\n"
-#: ../clients/cli/devices.c:303
+#: ../clients/cli/devices.c:302
#, c-format
msgid ""
"Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2459,7 +2455,7 @@ msgstr ""
"auto-connect に設定されていない接続についても考慮されます。\n"
"\n"
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:314
#, c-format
msgid ""
"Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2478,7 +2474,7 @@ msgstr ""
"行った変更で、デバイスの更新を試行します。\n"
"\n"
-#: ../clients/cli/devices.c:326
+#: ../clients/cli/devices.c:325
#, c-format
msgid ""
"Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2518,7 +2514,7 @@ msgstr ""
"nmcli dev mod em1 -ipv4.dns 1\n"
"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-#: ../clients/cli/devices.c:346
+#: ../clients/cli/devices.c:345
#, c-format
msgid ""
"Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2539,7 +2535,7 @@ msgstr ""
"それ以降の接続が自動アクティベートされることがなくなります。\n"
"\n"
-#: ../clients/cli/devices.c:358
+#: ../clients/cli/devices.c:357
#, c-format
msgid ""
"Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2562,7 +2558,7 @@ msgstr ""
"コマンドで削除できません。\n"
"\n"
-#: ../clients/cli/devices.c:371
+#: ../clients/cli/devices.c:370
#, c-format
msgid ""
"Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2585,7 +2581,7 @@ msgstr ""
"デバイスプロパティーを変更します。\n"
"\n"
-#: ../clients/cli/devices.c:384
+#: ../clients/cli/devices.c:383
#, c-format
msgid ""
"Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2607,7 +2603,7 @@ msgstr ""
"インターフェースが指定されない場合は、すべてのデバイスを監視します。\n"
"\n"
-#: ../clients/cli/devices.c:396
+#: ../clients/cli/devices.c:395
#, c-format
msgid ""
"Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2719,7 +2715,7 @@ msgstr ""
"表示するためのコマンドは 'nmcli device wifi list' です。\n"
"\n"
-#: ../clients/cli/devices.c:443
+#: ../clients/cli/devices.c:442
#, c-format
msgid ""
"Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2740,293 +2736,299 @@ msgstr ""
"特定のインターフェースの近接デバイスを一覧表示できます。\n"
"\n"
-#: ../clients/cli/devices.c:597
+#: ../clients/cli/devices.c:596
#, c-format
msgid "Error: No interface specified."
msgstr "エラー: インターフェースが指定されていません。"
-#: ../clients/cli/devices.c:620
+#: ../clients/cli/devices.c:619
#, c-format
msgid "Warning: argument '%s' is duplicated.\n"
msgstr "警告: 引数 '%s' が重複しています。\n"
-#: ../clients/cli/devices.c:623
+#: ../clients/cli/devices.c:622
#, c-format
msgid "Error: Device '%s' not found.\n"
msgstr "エラー: デバイス'%s' が見つかりません。\n"
-#: ../clients/cli/devices.c:624
+#: ../clients/cli/devices.c:623
#, c-format
msgid "Error: not all devices found."
msgstr "エラー: 一部のデバイスが見つかりません。"
-#: ../clients/cli/devices.c:653
+#: ../clients/cli/devices.c:652
msgid "No interface specified"
msgstr "インターフェースが指定されていません"
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:671
#, c-format
msgid "Device '%s' not found"
msgstr "デバイス'%s' が見つかりません"
-#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
+#: ../clients/cli/devices.c:754 ../clients/cli/devices.c:904
msgid "(none)"
msgstr "（なし）"
-#: ../clients/cli/devices.c:829
+#: ../clients/cli/devices.c:824
#, c-format
msgid "%u MHz"
msgstr "%u MHz"
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:825
#, c-format
msgid "%u Mbit/s"
msgstr "%u Mbit/s"
-#: ../clients/cli/devices.c:841
+#: ../clients/cli/devices.c:836
msgid "WEP"
msgstr "WEP"
-#: ../clients/cli/devices.c:845
+#: ../clients/cli/devices.c:840
msgid "WPA1"
msgstr "WPA1"
-#: ../clients/cli/devices.c:849
+#: ../clients/cli/devices.c:844
msgid "WPA2"
msgstr "WPA2"
-#: ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:849
msgid "802.1X"
msgstr "802.1X"
-#: ../clients/cli/devices.c:869
+#: ../clients/cli/devices.c:864
msgid "Ad-Hoc"
msgstr "アドホック"
-#: ../clients/cli/devices.c:870
+#: ../clients/cli/devices.c:865
msgid "Infra"
msgstr "インフラ"
-#: ../clients/cli/devices.c:871
+#: ../clients/cli/devices.c:866
msgid "N/A"
msgstr "なし"
-#: ../clients/cli/devices.c:1085
+#: ../clients/cli/devices.c:1079
msgid "Device details"
msgstr "デバイスの詳細"
-#: ../clients/cli/devices.c:1096
+#: ../clients/cli/devices.c:1090
#, c-format
msgid "Error: 'device show': %s"
msgstr "エラー: 'device show': %s"
-#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
+#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1158
msgid "(unknown)"
msgstr "(不明)"
-#: ../clients/cli/devices.c:1207
+#: ../clients/cli/devices.c:1201
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../clients/cli/devices.c:1310
+#: ../clients/cli/devices.c:1304
msgid "on"
msgstr "オン"
-#: ../clients/cli/devices.c:1310
+#: ../clients/cli/devices.c:1304
msgid "off"
msgstr "オフ"
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1535
#, c-format
msgid "Error: 'device status': %s"
msgstr "エラー: 'device status': %s"
-#: ../clients/cli/devices.c:1558
+#: ../clients/cli/devices.c:1549
msgid "Status of devices"
msgstr "デバイスの状態"
-#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
-#: ../clients/cli/devices.c:3817
+#: ../clients/cli/devices.c:1575 ../clients/cli/devices.c:2030
+#: ../clients/cli/devices.c:3912
#, c-format
msgid "Error: invalid extra argument '%s'."
msgstr "エラー: '%s' は無効な追加引数です。"
-#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
+#: ../clients/cli/devices.c:1611 ../clients/cli/general.c:538
#, c-format
msgid "Error: Timeout %d sec expired."
msgstr "エラー: 制限時間の %d 秒が経過"
-#: ../clients/cli/devices.c:1669
+#: ../clients/cli/devices.c:1660
#, c-format
msgid "Device '%s' successfully activated with '%s'.\n"
msgstr "デバイス '%s' が '%s' で正常にアクティベートされました。\n"
-#: ../clients/cli/devices.c:1675
+#: ../clients/cli/devices.c:1666
#, c-format
msgid "Error: Connection activation failed: (%d) %s.\n"
msgstr "エラー: 接続のアクティベーションに失敗しました: (%d) %s.\n"
-#: ../clients/cli/devices.c:1711
+#: ../clients/cli/devices.c:1702
#, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
msgstr "エラー: Wi-Fi hotspot の設定に失敗しました: %s"
-#: ../clients/cli/devices.c:1714
+#: ../clients/cli/devices.c:1705
#, c-format
msgid "Error: Failed to add/activate new connection: %s"
msgstr "エラー: 新規接続の追加またはアクティベートに失敗しました: %s"
-#: ../clients/cli/devices.c:1724
+#: ../clients/cli/devices.c:1715
#, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot"
msgstr "エラー: Wi-Fi hotspot の設定に失敗しました"
-#: ../clients/cli/devices.c:1726
+#: ../clients/cli/devices.c:1717
#, c-format
msgid "Error: Failed to add/activate new connection: Unknown error"
msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
-#: ../clients/cli/devices.c:1738
+#: ../clients/cli/devices.c:1729
#, c-format
msgid "Connection with UUID '%s' created and activated on device '%s'\n"
msgstr ""
"UUID '%s' の接続が、'%s' デバイス上に作成されアクティベートされました。\n"
-#: ../clients/cli/devices.c:1741
+#: ../clients/cli/devices.c:1732
#, c-format
msgid "Hotspot '%s' activated on device '%s'\n"
msgstr "ホットスポット '%s' が、デバイス '%s' でアクティベートされました\n"
-#: ../clients/cli/devices.c:1805
+#: ../clients/cli/devices.c:1796
#, c-format
msgid "Error: Device activation failed: %s"
msgstr "エラー: デバイスのアクティベートに失敗しました: %s"
-#: ../clients/cli/devices.c:1814
+#: ../clients/cli/devices.c:1805
#, c-format
msgid "Error: Device activation failed: device was disconnected"
msgstr ""
"エラー: デバイスのアクティベートに失敗しました: デバイスが切断されました"
-#: ../clients/cli/devices.c:1829
+#: ../clients/cli/devices.c:1820
#, c-format
msgid "Device '%s' has been connected.\n"
msgstr "デバイス '%s' は接続されています。\n"
-#: ../clients/cli/devices.c:1870
+#: ../clients/cli/devices.c:1861
#, c-format
msgid "Error: extra argument not allowed: '%s'."
msgstr "エラー: 追加の引数は許可されていません: '%s'。"
-#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
-#: ../clients/cli/devices.c:2187
+#: ../clients/cli/devices.c:1933 ../clients/cli/devices.c:1948
+#: ../clients/cli/devices.c:2178
#, c-format
msgid "Device '%s' successfully disconnected.\n"
msgstr "デバイス '%s' が正常に切断されました。\n"
-#: ../clients/cli/devices.c:1945
+#: ../clients/cli/devices.c:1936
#, c-format
msgid "Device '%s' successfully removed.\n"
msgstr "デバイス '%s' が正常に削除されました。\n"
-#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
+#: ../clients/cli/devices.c:1995 ../clients/cli/devices.c:2065
#, c-format
msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
msgstr "エラー: デバイス '%s' (%s) への接続の再適用に失敗しました: %s"
-#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2005 ../clients/cli/devices.c:2074
#, c-format
msgid "Connection successfully reapplied to device '%s'.\n"
msgstr "接続がデバイス '%s' に正常に再適用されました。\n"
-#: ../clients/cli/devices.c:2108
+#: ../clients/cli/devices.c:2099
#, c-format
msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
msgstr ""
"エラー: デバイス '%s' (%s) からの適用済み接続の読み取りに失敗しました: %s"
-#: ../clients/cli/devices.c:2172
+#: ../clients/cli/devices.c:2163
#, c-format
msgid "Error: not all devices disconnected."
msgstr "エラー: 一部のデバイスが切断されませんでした。"
-#: ../clients/cli/devices.c:2173
+#: ../clients/cli/devices.c:2164
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s\n"
-#: ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2242
#, c-format
msgid "Error: not all devices deleted."
msgstr "エラー: 一部のデバイスが削除されませんでした。"
-#: ../clients/cli/devices.c:2252
+#: ../clients/cli/devices.c:2243
#, c-format
msgid "Error: Device '%s' (%s) deletion failed: %s\n"
msgstr "エラー: デバイス '%s' (%s) の削除に失敗しました: %s\n"
-#: ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2327
#, c-format
msgid "Error: No property specified."
msgstr "エラー: プロパティーが指定されていません。"
-#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
-#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
+#: ../clients/cli/devices.c:2342 ../clients/cli/devices.c:2359
+#: ../clients/cli/general.c:710 ../clients/cli/general.c:722
#, c-format
msgid "Error: '%s' argument is missing."
msgstr "エラー: '%s' 引数がありません。"
-#: ../clients/cli/devices.c:2357
+#: ../clients/cli/devices.c:2348
#, c-format
msgid "Error: 'managed': %s."
msgstr "エラー: 'managed': %s。"
-#: ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:2365
#, c-format
msgid "Error: 'autoconnect': %s."
msgstr "エラー: '自動接続': %s。"
-#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
+#: ../clients/cli/devices.c:2373 ../clients/cli/general.c:736
#, c-format
msgid "Error: property '%s' is not known."
msgstr "エラー: プロパティー '%s' が不明です。"
-#: ../clients/cli/devices.c:2432
+#: ../clients/cli/devices.c:2422
#, c-format
msgid "%s: using connection '%s'\n"
msgstr "%s: 接続 '%s' を使用中\n"
-#: ../clients/cli/devices.c:2458
+#: ../clients/cli/devices.c:2448
#, c-format
msgid "%s: device created\n"
msgstr "%s: デバイスが作成されました\n"
-#: ../clients/cli/devices.c:2465
+#: ../clients/cli/devices.c:2455
#, c-format
msgid "%s: device removed\n"
msgstr "%s: デバイスが削除されました\n"
-#: ../clients/cli/devices.c:2663
+#: ../clients/cli/devices.c:2630
msgid "Wi-Fi scan list"
msgstr "Wi-Fi スキャン一覧"
-#: ../clients/cli/devices.c:2712
+#: ../clients/cli/devices.c:2707
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
+
+#: ../clients/cli/devices.c:2897
#, c-format
msgid "Error: 'device wifi': %s"
msgstr "エラー: 'dev wifi': %s"
-#: ../clients/cli/devices.c:2724
+#: ../clients/cli/devices.c:2915
#, c-format
-msgid "Error: Device '%s' not found."
-msgstr "エラー: デバイス'%s' が見つかりません"
+msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
+msgstr ""
+"エラー: 無効な再スキャン引数です: '%s' は [auto、no、yes] にはありません"
-#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
+#: ../clients/cli/devices.c:2922
#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
+msgid "Error: Device '%s' not found."
+msgstr "エラー: デバイス'%s' が見つかりません"
-#: ../clients/cli/devices.c:2773
+#: ../clients/cli/devices.c:2932
#, c-format
msgid ""
"Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3035,27 +3037,27 @@ msgstr ""
"エラー: デバイス '%s' が Wi-Fi デバイスとして認識されませんでした。"
"NetworkManager Wi-Fi プラグインを確認してください。"
-#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
-#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
+#: ../clients/cli/devices.c:2936 ../clients/cli/devices.c:3154
+#: ../clients/cli/devices.c:3591 ../clients/cli/devices.c:3750
#, c-format
msgid "Error: Device '%s' is not a Wi-Fi device."
msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
-#: ../clients/cli/devices.c:2909
+#: ../clients/cli/devices.c:3003
msgid "SSID or BSSID: "
msgstr "SSID または BSSID: "
-#: ../clients/cli/devices.c:2914
+#: ../clients/cli/devices.c:3008
#, c-format
msgid "Error: SSID or BSSID are missing."
msgstr "エラー: SSID または BSSID がありません。"
-#: ../clients/cli/devices.c:2951
+#: ../clients/cli/devices.c:3045
#, c-format
msgid "Error: bssid argument value '%s' is not a valid BSSID."
msgstr "エラー: bssid の引数値 '%s' は、有効な BSSID ではありません。"
-#: ../clients/cli/devices.c:2981
+#: ../clients/cli/devices.c:3075
#, c-format
msgid ""
"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3063,120 +3065,120 @@ msgstr ""
"エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用し"
"てください。"
-#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
+#: ../clients/cli/devices.c:3102 ../clients/cli/devices.c:3120
#, c-format
msgid "Error: %s: %s."
msgstr "エラー: %s: %s。"
-#: ../clients/cli/devices.c:3043
+#: ../clients/cli/devices.c:3137
#, c-format
msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
msgstr ""
"エラー: (%s) が接続先となる BSSID は、bssid 引数 (%s) により異なります。"
-#: ../clients/cli/devices.c:3049
+#: ../clients/cli/devices.c:3143
#, c-format
msgid "Error: Parameter '%s' is neither SSID nor BSSID."
msgstr "エラー: パラメーター '%s' は、SSID、BSSID のいずれでもありません。"
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
-#: ../clients/cli/devices.c:3656
+#: ../clients/cli/devices.c:3156 ../clients/cli/devices.c:3593
+#: ../clients/cli/devices.c:3752
#, c-format
msgid "Error: No Wi-Fi device found."
msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
-#: ../clients/cli/devices.c:3082
+#: ../clients/cli/devices.c:3176
#, c-format
msgid "Error: Failed to scan hidden SSID: %s."
msgstr "エラー: 非表示の SSID のスキャンに失敗しました: %s。"
-#: ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3203
#, c-format
msgid "Error: No network with SSID '%s' found."
msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
-#: ../clients/cli/devices.c:3111
+#: ../clients/cli/devices.c:3205
#, c-format
msgid "Error: No access point with BSSID '%s' found."
msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
-#: ../clients/cli/devices.c:3153
+#: ../clients/cli/devices.c:3247
#, c-format
msgid ""
"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
msgstr ""
"警告: '%s' は、非表示 AP の SSID である必要がありますが、BSSID のようです。\n"
-#: ../clients/cli/devices.c:3167
+#: ../clients/cli/devices.c:3263
msgid "Password: "
msgstr "パスワード: "
-#: ../clients/cli/devices.c:3316
+#: ../clients/cli/devices.c:3412
#, c-format
msgid "'%s' is not valid WPA PSK"
msgstr "'%s' は有効な WPA PSK ではありません"
-#: ../clients/cli/devices.c:3333
+#: ../clients/cli/devices.c:3429
#, c-format
msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
msgstr ""
"'%s' は有効な WEP キーではありません (5 または 13 文字の ASCII 文字である必要"
"があります)"
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3445
#, c-format
msgid "Hotspot password: %s\n"
msgstr "ホットスポットのパスワード: %s\n"
-#: ../clients/cli/devices.c:3420
+#: ../clients/cli/devices.c:3516
#, c-format
msgid "Error: ssid is too long."
msgstr "エラー: ssid が長すぎます。"
-#: ../clients/cli/devices.c:3434
+#: ../clients/cli/devices.c:3530
#, c-format
msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
msgstr ""
"エラー: バンド引数値 '%s' は無効です。'a' または 'bg' を使用してください。"
-#: ../clients/cli/devices.c:3459
+#: ../clients/cli/devices.c:3555
#, c-format
msgid "Error: Unknown parameter %s."
msgstr "エラー: 不明なパラメータ %s です。"
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3575
#, c-format
msgid "Error: channel requires band too."
msgstr "エラー: チャネルにはバンドも必要です。"
-#: ../clients/cli/devices.c:3484
+#: ../clients/cli/devices.c:3580
#, c-format
msgid "Error: channel '%s' not valid for band '%s'."
msgstr "エラー: チャンネル '%s' は、バンド '%s' に対して有効ではありません。"
-#: ../clients/cli/devices.c:3508
+#: ../clients/cli/devices.c:3604
#, c-format
msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
msgstr ""
"エラー: デバイス '%s' は、AP またはアドホックモードのいずれもサポートしませ"
"ん。"
-#: ../clients/cli/devices.c:3542
+#: ../clients/cli/devices.c:3638
#, c-format
msgid "Error: Invalid 'password': %s."
msgstr "エラー: 無効なパスワード: %s。"
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3713
#, c-format
msgid "Error: '%s' cannot repeat."
msgstr "エラー: '%s' を繰り返すことはできません。"
#. Main header name
-#: ../clients/cli/devices.c:3723
+#: ../clients/cli/devices.c:3818
msgid "Device LLDP neighbors"
msgstr "LLDP 近接デバイス"
-#: ../clients/cli/devices.c:3833
+#: ../clients/cli/devices.c:3928
#, c-format
msgid "Error: 'device lldp list': %s"
msgstr "エラー: 'device lldp list': %s"
@@ -3197,7 +3199,7 @@ msgstr "接続完了 (ローカルのみ)"
msgid "connected (site only)"
msgstr "接続完了 (サイトのみ)"
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:282
msgid "connected"
msgstr "接続済み"
@@ -3205,51 +3207,51 @@ msgstr "接続済み"
msgid "disconnecting"
msgstr "切断中"
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:268
msgid "disconnected"
msgstr "切断済み"
-#: ../clients/cli/general.c:80
+#: ../clients/cli/general.c:83
msgid "none"
msgstr "なし"
-#: ../clients/cli/general.c:81
+#: ../clients/cli/general.c:84
msgid "portal"
msgstr "ポータル"
-#: ../clients/cli/general.c:82
+#: ../clients/cli/general.c:85
msgid "limited"
msgstr "制限付き"
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:86
msgid "full"
msgstr "完全"
-#: ../clients/cli/general.c:154
+#: ../clients/cli/general.c:158
msgid "auth"
msgstr "認証"
-#: ../clients/cli/general.c:189
+#: ../clients/cli/general.c:186
msgid "running"
msgstr "実行中"
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
msgid "starting"
msgstr "起動中"
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
msgid "started"
msgstr "起動しました"
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
msgid "enabled"
msgstr "有効"
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
msgid "disabled"
msgstr "無効"
-#: ../clients/cli/general.c:369
+#: ../clients/cli/general.c:352
#, c-format
msgid ""
"Usage: nmcli general { COMMAND | help }\n"
@@ -3278,7 +3280,7 @@ msgstr ""
" logging [level <ログレベル>] [domains <ログドメイン>]\n"
"\n"
-#: ../clients/cli/general.c:380
+#: ../clients/cli/general.c:363
#, c-format
msgid ""
"Usage: nmcli general status { help }\n"
@@ -3295,7 +3297,7 @@ msgstr ""
"status' を実行したことになります。\n"
"\n"
-#: ../clients/cli/general.c:389
+#: ../clients/cli/general.c:372
#, c-format
msgid ""
"Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3318,7 +3320,7 @@ msgstr ""
"渡すと、そのホスト名をシステムの永続的なホスト名として新たに設定します。\n"
"\n"
-#: ../clients/cli/general.c:401
+#: ../clients/cli/general.c:384
#, c-format
msgid ""
"Usage: nmcli general permissions { help }\n"
@@ -3331,7 +3333,7 @@ msgstr ""
"認証されている操作に対する呼び出し側のパーミッションを表示します。\n"
"\n"
-#: ../clients/cli/general.c:409
+#: ../clients/cli/general.c:392
#, c-format
msgid ""
"Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3357,7 +3359,7 @@ msgstr ""
"使用できるログ記録のドメイン一覧については man ページを参照してください。\n"
"\n"
-#: ../clients/cli/general.c:422
+#: ../clients/cli/general.c:405
#, c-format
msgid ""
"Usage: nmcli networking { COMMAND | help }\n"
@@ -3382,7 +3384,7 @@ msgstr ""
" connectivity [check]\n"
"\n"
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:415
#, c-format
msgid ""
"Usage: nmcli networking on { help }\n"
@@ -3395,7 +3397,7 @@ msgstr ""
"ネットワークをオンに切り替えます。\n"
"\n"
-#: ../clients/cli/general.c:440
+#: ../clients/cli/general.c:423
#, c-format
msgid ""
"Usage: nmcli networking off { help }\n"
@@ -3408,7 +3410,7 @@ msgstr ""
"ネットワークをオフに切り替えます。\n"
"\n"
-#: ../clients/cli/general.c:448
+#: ../clients/cli/general.c:431
#, c-format
msgid ""
"Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3427,7 +3429,7 @@ msgstr ""
"ネットワークの接続状態を取得します。\n"
"オプションの 'check' 引数を付けると接続を再チェックします。\n"
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:443
#, c-format
msgid ""
"Usage: nmcli radio { COMMAND | help }\n"
@@ -3444,7 +3446,7 @@ msgstr ""
" all | wifi | wwan [ on | off ]\n"
"\n"
-#: ../clients/cli/general.c:469
+#: ../clients/cli/general.c:452
#, c-format
msgid ""
"Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3461,7 +3463,7 @@ msgstr ""
"すべてのラジオスイッチの状態を取得、またはオンかオフにします。\n"
"\n"
-#: ../clients/cli/general.c:479
+#: ../clients/cli/general.c:462
#, c-format
msgid ""
"Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3478,7 +3480,7 @@ msgstr ""
"Wi-Fi ラジオスイッチの状態を取得、またはオンかオフにします。\n"
"\n"
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:472
#, c-format
msgid ""
"Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3496,7 +3498,7 @@ msgstr ""
"す。\n"
"\n"
-#: ../clients/cli/general.c:499
+#: ../clients/cli/general.c:482
#, c-format
msgid ""
"Usage: nmcli monitor\n"
@@ -3511,180 +3513,180 @@ msgstr ""
"NetworkManager で変更が行われるたびに行を出力します。\n"
"\n"
-#: ../clients/cli/general.c:528
+#: ../clients/cli/general.c:511
msgid "NetworkManager status"
msgstr "NetworkManager のステータス"
-#: ../clients/cli/general.c:532
+#: ../clients/cli/general.c:515
#, c-format
msgid "Error: only these fields are allowed: %s"
msgstr "エラー: 使用できるのは次のフィールドのみです: %s"
-#: ../clients/cli/general.c:582
+#: ../clients/cli/general.c:568
msgid "NetworkManager permissions"
msgstr "NetworkManager のパーミッション"
-#: ../clients/cli/general.c:586
+#: ../clients/cli/general.c:572
#, c-format
msgid "Error: 'general permissions': %s"
msgstr "エラー: 'general permissions': %s"
-#: ../clients/cli/general.c:674
+#: ../clients/cli/general.c:660
msgid "NetworkManager logging"
msgstr "NetworkManager のロギング"
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:664
#, c-format
msgid "Error: 'general logging': %s"
msgstr "エラー: 'general logging': %s"
-#: ../clients/cli/general.c:760
+#: ../clients/cli/general.c:746
#, c-format
msgid "Error: failed to set logging: %s"
msgstr "エラー: ロギングの設定に失敗しました: %s"
-#: ../clients/cli/general.c:777
+#: ../clients/cli/general.c:763
#, c-format
msgid "Error: failed to set hostname: %s"
msgstr "エラー: ホスト名の設定に失敗しました: %s"
-#: ../clients/cli/general.c:846
+#: ../clients/cli/general.c:832
#, c-format
msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
msgstr ""
"エラー: '--fields' の値 '%s' はここでは無効です (使用できるフィールド: %s)"
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:857
#, c-format
msgid "Error: invalid '%s' argument: '%s' (use on/off)."
msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
#. no arguments -> get current state
-#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
+#: ../clients/cli/general.c:905 ../clients/cli/general.c:917
msgid "Connectivity"
msgstr "接続性"
-#: ../clients/cli/general.c:934
+#: ../clients/cli/general.c:920
#, c-format
msgid "Error: 'networking' command '%s' is not valid."
msgstr ""
"エラー: 'networking' のコマンド '%s' は、有効なコマンドではありません。"
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:934
msgid "Networking"
msgstr "ネットワーキング"
#. no argument, show all radio switches
-#: ../clients/cli/general.c:983
+#: ../clients/cli/general.c:969
msgid "Radio switches"
msgstr "ラジオスイッチ"
#. no argument, show current WiFi state
-#: ../clients/cli/general.c:1013
+#: ../clients/cli/general.c:999
msgid "Wi-Fi radio switch"
msgstr "Wi-Fi ラジオスイッチ"
#. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1040
+#: ../clients/cli/general.c:1026
msgid "WWAN radio switch"
msgstr "WWAN ラジオスイッチ"
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1074
msgid "NetworkManager has started"
msgstr "NetworkManager が起動されました"
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1074
msgid "NetworkManager has stopped"
msgstr "NetworkManager が停止しました"
-#: ../clients/cli/general.c:1100
+#: ../clients/cli/general.c:1085
#, c-format
msgid "Hostname set to '%s'\n"
msgstr "ホスト名が '%s' に設定されました\n"
-#: ../clients/cli/general.c:1115
+#: ../clients/cli/general.c:1100
#, c-format
msgid "'%s' is now the primary connection\n"
msgstr "'%s' はプライマリー接続です\n"
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1102
#, c-format
msgid "There's no primary connection\n"
msgstr "プライマリー接続がありません\n"
-#: ../clients/cli/general.c:1129
+#: ../clients/cli/general.c:1114
#, c-format
msgid "Connectivity is now '%s'\n"
msgstr "接続性は '%s' です\n"
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1127
#, c-format
msgid "Networkmanager is now in the '%s' state\n"
msgstr "Networkmanager の状態は '%s' です\n"
-#: ../clients/cli/general.c:1163
+#: ../clients/cli/general.c:1147
msgid "connection available"
msgstr "接続が利用可能"
-#: ../clients/cli/general.c:1165
+#: ../clients/cli/general.c:1149
msgid "connections available"
msgstr "接続が利用可能"
-#: ../clients/cli/general.c:1183
+#: ../clients/cli/general.c:1167
msgid "autoconnect"
msgstr "自動接続"
-#: ../clients/cli/general.c:1185
+#: ../clients/cli/general.c:1169
msgid "fw missing"
msgstr "fw がありません"
-#: ../clients/cli/general.c:1190
+#: ../clients/cli/general.c:1174
msgid "plugin missing"
msgstr "プラグインがありません"
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1179
msgid "sw"
msgstr "sw"
-#: ../clients/cli/general.c:1197
+#: ../clients/cli/general.c:1181
msgid "hw"
msgstr "hw"
-#: ../clients/cli/general.c:1202
+#: ../clients/cli/general.c:1186
msgid "iface"
msgstr "iface"
-#: ../clients/cli/general.c:1205
+#: ../clients/cli/general.c:1189
msgid "port"
msgstr "ポート"
-#: ../clients/cli/general.c:1208
+#: ../clients/cli/general.c:1192
msgid "mtu"
msgstr "mtu"
-#: ../clients/cli/general.c:1225
+#: ../clients/cli/general.c:1209
msgid "master"
msgstr "マスター"
-#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
-#: ../clients/tui/nmt-connect-connection-list.c:408
+#: ../clients/cli/general.c:1213 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/tui/nmt-connect-connection-list.c:407
msgid "VPN"
msgstr "VPN"
-#: ../clients/cli/general.c:1231
+#: ../clients/cli/general.c:1215
msgid "ip4 default"
msgstr "ip4 デフォルト"
-#: ../clients/cli/general.c:1233
+#: ../clients/cli/general.c:1217
msgid "ip6 default"
msgstr "ip6 デフォルト"
-#: ../clients/cli/general.c:1316
+#: ../clients/cli/general.c:1300
#, c-format
msgid "%s VPN connection"
msgstr "%s VPN 接続"
-#: ../clients/cli/general.c:1386
+#: ../clients/cli/general.c:1368
#, c-format
msgid ""
"Use \"nmcli device show\" to get complete information about known devices "
@@ -3702,21 +3704,23 @@ msgstr ""
"使用方法の詳細情報については、nmcli(1) と nmcli-examples(5) の man ページを参"
"照してください。\n"
-#: ../clients/cli/general.c:1407
+#: ../clients/cli/general.c:1389
#, c-format
msgid "Error: 'monitor' command '%s' is not valid."
msgstr "エラー: 'monitor' コマンド '%s' は有効ではありません。"
-#: ../clients/cli/general.c:1419
+#: ../clients/cli/general.c:1401
msgid "Networkmanager is not running (waiting for it)\n"
msgstr "Networkmanager が実行されていません (待機中)\n"
-#: ../clients/cli/nmcli.c:184
+#: ../clients/cli/nmcli.c:242
#, c-format
msgid ""
"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n"
+" -o[verview] overview mode (hide default "
+"values)\n"
" -t[erse] terse output\n"
" -p[retty] pretty output\n"
" -m[ode] tabular|multiline output mode\n"
@@ -3747,6 +3751,8 @@ msgstr ""
"使い方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n"
+" -o[verview] overview mode (hide default "
+"values)\n"
" -t[erse] terse output\n"
" -p[retty] pretty output\n"
" -m[ode] tabular|multiline output mode\n"
@@ -3774,62 +3780,82 @@ msgstr ""
" m[onitor] monitor NetworkManager changes\n"
"\n"
-#: ../clients/cli/nmcli.c:263
+#: ../clients/cli/nmcli.c:322
#, c-format
msgid "Error: missing argument for '%s' option."
msgstr "エラー: %s オプション用の引数がありません。"
-#: ../clients/cli/nmcli.c:311
+#: ../clients/cli/nmcli.c:532
+#, c-format
+msgid "Unexpected end of file following '%s'\n"
+msgstr "'%s' に続く、予期せぬファイルの終了\n"
+
+#: ../clients/cli/nmcli.c:540
+#, c-format
+msgid "Expected whitespace following '%s'\n"
+msgstr "'%s' に続く、必要なホワイトスペース\n"
+
+#: ../clients/cli/nmcli.c:552
+#, c-format
+msgid "Expected a value for '%s'\n"
+msgstr "'%s' には値が必要です\n"
+
+#: ../clients/cli/nmcli.c:566
+#, c-format
+msgid "Expected a line break following '%s'\n"
+msgstr "'%s' に続く改行が必要です\n"
+
+#: ../clients/cli/nmcli.c:663
#, c-format
msgid "Error: Option '--terse' is specified the second time."
msgstr "エラー: オプション '--terse' が二度指定されています。"
-#: ../clients/cli/nmcli.c:316
+#: ../clients/cli/nmcli.c:668
#, c-format
msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:676
#, c-format
msgid "Error: Option '--pretty' is specified the second time."
msgstr "エラー: オプション '--pretty' が二度指定されています。"
-#: ../clients/cli/nmcli.c:329
+#: ../clients/cli/nmcli.c:681
#, c-format
msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
-#: ../clients/cli/nmcli.c:344
+#: ../clients/cli/nmcli.c:696
#, c-format
msgid "Error: '%s' is not a valid argument for '%s' option."
msgstr "エラー: '%s' は、'%s' オプションの有効な引数ではありません。"
-#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
+#: ../clients/cli/nmcli.c:710 ../clients/cli/nmcli.c:722
#, c-format
msgid "Error: '%s' is not valid argument for '%s' option."
msgstr "エラー: '%s' は、'%s' オプション用の有効な引数ではありません。"
-#: ../clients/cli/nmcli.c:394
+#: ../clients/cli/nmcli.c:746
#, c-format
msgid "Error: '%s' is not a valid timeout."
msgstr "エラー: '%s' は有効なタイムアウトではありません。"
-#: ../clients/cli/nmcli.c:401
+#: ../clients/cli/nmcli.c:753
#, c-format
msgid "nmcli tool, version %s\n"
msgstr "nmcli ツール、バージョン %s\n"
-#: ../clients/cli/nmcli.c:409
+#: ../clients/cli/nmcli.c:761
#, c-format
msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
msgstr "エラー: オプション '%s' は不明です。'nmcli -help' で確認してください。"
-#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
+#: ../clients/cli/nmcli.c:814 ../clients/cli/nmcli.c:821
#, c-format
-msgid "Error: nmcli terminated by signal %s (%d)\n"
-msgstr "Error: nmcli がシグナル %s (%d) で終了しました\n"
+msgid "Error: nmcli terminated by signal %s (%d)"
+msgstr "エラー: nmcli がシグナル %s (%d) で終了しました"
-#: ../clients/cli/nmcli.c:560
+#: ../clients/cli/nmcli.c:963
msgid "Success"
msgstr "成功"
@@ -3838,12 +3864,12 @@ msgstr "成功"
msgid "Authentication message: %s\n"
msgstr "認証メッセージ: %s\n"
-#: ../clients/cli/polkit-agent.c:74
+#: ../clients/cli/polkit-agent.c:76
#, c-format
msgid "Authentication error: %s\n"
msgstr "認証エラー: %s\n"
-#: ../clients/cli/polkit-agent.c:120
+#: ../clients/cli/polkit-agent.c:136
#, c-format
msgid "Warning: polkit agent initialization failed: %s\n"
msgstr "警告: polkit エージェントの初期化に失敗しました: %s\n"
@@ -3876,513 +3902,522 @@ msgstr ""
msgid "Do you want to remove them? [yes] "
msgstr "削除しますか? [yes] "
-#: ../clients/cli/settings.c:330
+#: ../clients/cli/settings.c:332
#, c-format
msgid "Warning: %s is not an UUID of any existing connection profile\n"
msgstr "警告: %s は既存の接続プロファイルの UUID ではありません\n"
-#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
+#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
#, c-format
msgid "'%s' is not a VPN connection profile"
msgstr "'%s' は VPN 接続プロファイルではありません"
-#: ../clients/cli/settings.c:342
+#: ../clients/cli/settings.c:344
#, c-format
msgid "'%s' is not a name of any exiting profile"
msgstr "'%s' は既存のプロファイルの名前ではありません"
-#: ../clients/cli/settings.c:386
+#: ../clients/cli/settings.c:388
#, c-format
msgid "Warning: %s\n"
msgstr "警告: %s\n"
-#: ../clients/cli/settings.c:389
+#: ../clients/cli/settings.c:391
#, c-format
msgid "Info: %s\n"
msgstr "情報: %s\n"
-#: ../clients/cli/settings.c:481
+#: ../clients/cli/settings.c:484
msgid "don't know how to get the property value"
-msgstr "プロパティ値の取得方法がわかりません"
+msgstr "プロパティー値の取得方法がわかりません"
-#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
+#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
msgid "the property can't be changed"
-msgstr "このプロパティは変更できません"
+msgstr "このプロパティーは変更できません"
-#: ../clients/cli/settings.c:733
+#: ../clients/cli/settings.c:736
msgid "[NM property description]"
-msgstr "[NM プロパティの詳細]"
+msgstr "[NM プロパティーの詳細]"
-#: ../clients/cli/settings.c:743
+#: ../clients/cli/settings.c:746
msgid "[nmcli specific description]"
msgstr "[nmcli 固有の詳細]"
-#: ../clients/cli/utils.c:328
+#: ../clients/cli/utils.c:317
#, c-format
msgid "Error: Argument '%s' was expected, but '%s' provided."
msgstr "エラー: 引数 '%s' が必要ですが、'%s' が指定されました。"
-#: ../clients/cli/utils.c:331
+#: ../clients/cli/utils.c:320
#, c-format
msgid "Error: Unexpected argument '%s'"
msgstr "エラー: 予期しない引数 '%s' です"
-#: ../clients/cli/utils.c:804
+#: ../clients/cli/utils.c:699
#, c-format
msgid "invalid field '%s%s%s'; no such field"
msgstr "無効なフィールド '%s%s%s'。そのようなフィールドはありません"
-#: ../clients/cli/utils.c:808
+#: ../clients/cli/utils.c:703
#, c-format
msgid "invalid field '%s%s%s'; allowed fields: [%s]"
msgstr "無効なフィールド '%s%s%s'。使用できるフィールド: [%s]"
-#: ../clients/cli/utils.c:881
+#: ../clients/cli/utils.c:776
#, c-format
msgid "failure to select field"
msgstr "フィールドの選択に失敗しました"
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1369
#, c-format
msgid "Error reading nmcli output: %s\n"
msgstr "nmcli 出力の読み込み中にエラーが発生しました: %s\n"
-#: ../clients/cli/utils.c:1474
+#: ../clients/cli/utils.c:1374
#, c-format
msgid "Error writing nmcli output: %s\n"
msgstr "nmcli 出力の書き込み中にエラーが発生しました: %s\n"
-#: ../clients/cli/utils.c:1498
+#: ../clients/cli/utils.c:1398
#, c-format
msgid "Failed to create pager pipe: %s\n"
msgstr "ページャーパイプの作成に失敗しました: %s\n"
-#: ../clients/cli/utils.c:1506
+#: ../clients/cli/utils.c:1406
#, c-format
msgid "Failed to fork pager: %s\n"
msgstr "ページャーのフォークに失敗しました: %s\n"
-#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
+#: ../clients/cli/utils.c:1452 ../clients/cli/utils.c:1454
#, c-format
msgid "Failed to duplicate pager pipe: %s\n"
msgstr "ページャーパイプの複製に失敗しました: %s\n"
+#: ../clients/cli/utils.h:239
+#, c-format
+msgid "%lld (%s)"
+msgstr "%lld (%s)"
+
#. TRANSLATORS: the first %s is the partial value entered by
#. * the user, the second %s a list of compatible values.
#.
-#: ../clients/common/nm-client-utils.c:75
-#: ../clients/common/nm-client-utils.c:106
+#: ../clients/common/nm-client-utils.c:117
+#: ../clients/common/nm-client-utils.c:148
#, c-format
msgid "'%s' is ambiguous (%s)"
msgstr "'%s' が不明瞭です (%s)"
-#: ../clients/common/nm-client-utils.c:85
+#: ../clients/common/nm-client-utils.c:127
#, c-format
msgid "'%s' is not valid; use [%s] or [%s]"
msgstr "'%s' は無効です。[%s] か [%s] を使用してください"
-#: ../clients/common/nm-client-utils.c:118
+#: ../clients/common/nm-client-utils.c:160
#, c-format
msgid "'%s' is not valid; use [%s], [%s] or [%s]"
msgstr "'%s' は無効です。[%s]、[%s]、または [%s] を使用してください"
-#: ../clients/common/nm-client-utils.c:155
+#: ../clients/common/nm-client-utils.c:209
#, c-format
-msgid "'%s' is ambiguous (%s x %s)"
-msgstr "'%s' が不明瞭です (%s x %s)"
+msgid "'%s' is ambiguous: %s"
+msgstr "'%s' が不明瞭です: %s"
-#: ../clients/common/nm-client-utils.c:167
+#: ../clients/common/nm-client-utils.c:219
#, c-format
msgid "missing name, try one of [%s]"
msgstr "名前がありません、[%s] のうちのいずれかで試してみてください"
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:264
msgid "unmanaged"
msgstr "管理無し"
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/common/nm-client-utils.c:266
msgid "unavailable"
msgstr "利用不可"
-#: ../clients/common/nm-client-utils.c:229
+#: ../clients/common/nm-client-utils.c:270
msgid "connecting (prepare)"
msgstr "接続中 (準備)"
-#: ../clients/common/nm-client-utils.c:231
+#: ../clients/common/nm-client-utils.c:272
msgid "connecting (configuring)"
msgstr "接続中 (設定中)"
-#: ../clients/common/nm-client-utils.c:233
+#: ../clients/common/nm-client-utils.c:274
msgid "connecting (need authentication)"
msgstr "接続中 (認証が必要)"
-#: ../clients/common/nm-client-utils.c:235
+#: ../clients/common/nm-client-utils.c:276
msgid "connecting (getting IP configuration)"
msgstr "接続中 (IP 設定を取得中)"
-#: ../clients/common/nm-client-utils.c:237
+#: ../clients/common/nm-client-utils.c:278
msgid "connecting (checking IP connectivity)"
msgstr "接続中 (IP の接続性チェック)"
-#: ../clients/common/nm-client-utils.c:239
+#: ../clients/common/nm-client-utils.c:280
msgid "connecting (starting secondary connections)"
msgstr "接続中 (セカンダリー接続を開始)"
-#: ../clients/common/nm-client-utils.c:245
+#: ../clients/common/nm-client-utils.c:286
msgid "connection failed"
msgstr "接続に失敗"
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:303
msgid "yes (guessed)"
msgstr "はい (推測)"
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:305
msgid "no (guessed)"
msgstr "いいえ (推測)"
-#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:318
msgid "No reason given"
msgstr "原因不明"
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:322
msgid "Device is now managed"
msgstr "デバイスが管理下に置かれました"
-#: ../clients/common/nm-client-utils.c:283
+#: ../clients/common/nm-client-utils.c:324
msgid "Device is now unmanaged"
msgstr "デバイスが管理下から外れました"
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:326
msgid "The device could not be readied for configuration"
msgstr "デバイスの設定準備ができませんでした"
-#: ../clients/common/nm-client-utils.c:287
+#: ../clients/common/nm-client-utils.c:328
msgid ""
"IP configuration could not be reserved (no available address, timeout, etc.)"
msgstr ""
"IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/common/nm-client-utils.c:330
msgid "The IP configuration is no longer valid"
msgstr "この IP 設定は無効になりました"
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:332
msgid "Secrets were required, but not provided"
msgstr "シークレットが必要でしたが入力されませんでした"
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:334
msgid "802.1X supplicant disconnected"
msgstr "802.1X サプリカントが切断されました"
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:336
msgid "802.1X supplicant configuration failed"
msgstr "802.1X サプリカントの設定に失敗しました"
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:338
msgid "802.1X supplicant failed"
msgstr "802.1X サプリカントが失敗しました"
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:340
msgid "802.1X supplicant took too long to authenticate"
msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:342
msgid "PPP service failed to start"
msgstr "PPP サービスの開始に失敗しました"
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:344
msgid "PPP service disconnected"
msgstr "PPP サービスの接続が切断されました"
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:346
msgid "PPP failed"
msgstr "PPP の失敗"
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:348
msgid "DHCP client failed to start"
msgstr "DHCP クライアントの開始に失敗しました"
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:350
msgid "DHCP client error"
msgstr "DHCP クライアントエラー"
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:352
msgid "DHCP client failed"
msgstr "DHCP クライアントの失敗"
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:354
msgid "Shared connection service failed to start"
msgstr "共有接続サービスの開始に失敗しました"
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:356
msgid "Shared connection service failed"
msgstr "共有接続サービスの失敗"
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:358
msgid "AutoIP service failed to start"
msgstr "AutoIP サービスの開始に失敗しました"
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:360
msgid "AutoIP service error"
msgstr "AutoIP サービスエラー"
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:362
msgid "AutoIP service failed"
msgstr "AutoIP サービスの失敗"
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:364
msgid "The line is busy"
msgstr "回線が使用中です"
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:366
msgid "No dial tone"
msgstr "ダイアル音がありません"
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:368
msgid "No carrier could be established"
msgstr "確立できるキャリアがありませんでした"
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:370
msgid "The dialing request timed out"
msgstr "ダイアル要求がタイムアウトしました"
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:372
msgid "The dialing attempt failed"
msgstr "ダイアルの試行に失敗しました"
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:374
msgid "Modem initialization failed"
msgstr "モデムの初期化に失敗しました"
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:376
msgid "Failed to select the specified APN"
msgstr "指定された APN の選択に失敗しました"
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:378
msgid "Not searching for networks"
msgstr "ネットワーク検索をしていません"
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:380
msgid "Network registration denied"
msgstr "ネットワークの登録が拒否されました"
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:382
msgid "Network registration timed out"
msgstr "ネットワークの登録がタイムアウトになりました"
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:384
msgid "Failed to register with the requested network"
msgstr "要求されたネットワークへの登録に失敗しました"
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:386
msgid "PIN check failed"
msgstr "PIN 確認に失敗しました"
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:388
msgid "Necessary firmware for the device may be missing"
msgstr "このデバイスに必要なファームウェアがない可能性があります"
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:390
msgid "The device was removed"
msgstr "このデバイスは削除されました"
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:392
msgid "NetworkManager went to sleep"
msgstr "NetworkManager がスリープ状態に入りました"
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:394
msgid "The device's active connection disappeared"
msgstr "このデバイスのアクティブな接続が消滅しました"
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:396
msgid "Device disconnected by user or client"
msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:398
msgid "Carrier/link changed"
msgstr "キャリア/リンクが変更されました"
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:400
msgid "The device's existing connection was assumed"
msgstr "デバイスの既存の接続とみなされました"
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:402
msgid "The supplicant is now available"
msgstr "サプリカントが使用できるようになりました"
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:404
msgid "The modem could not be found"
msgstr "モデムが見つかりませんでした"
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:406
msgid "The Bluetooth connection failed or timed out"
msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:408
msgid "GSM Modem's SIM card not inserted"
msgstr "GSM モデムの SIM カードが挿入されていません"
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:410
msgid "GSM Modem's SIM PIN required"
msgstr "GSM モデムの SIM PIN が必要です"
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:412
msgid "GSM Modem's SIM PUK required"
msgstr "GSM モデムの SIM PUK が必要です"
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:414
msgid "GSM Modem's SIM wrong"
msgstr "GSM モデムの SIM が間違っています"
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:416
msgid "InfiniBand device does not support connected mode"
msgstr "InfiniBand デバイスでは接続モードに対応していません"
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:418
msgid "A dependency of the connection failed"
msgstr "接続依存性の失敗"
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:420
msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
-#: ../clients/common/nm-client-utils.c:381
+#: ../clients/common/nm-client-utils.c:422
msgid "ModemManager is unavailable"
msgstr "ModemManager は使用できません"
-#: ../clients/common/nm-client-utils.c:383
+#: ../clients/common/nm-client-utils.c:424
msgid "The Wi-Fi network could not be found"
msgstr "Wi-Fi ネットワークが見つかりませんでした"
-#: ../clients/common/nm-client-utils.c:385
+#: ../clients/common/nm-client-utils.c:426
msgid "A secondary connection of the base connection failed"
msgstr "ベース接続のセカンダリー接続に失敗しました"
-#: ../clients/common/nm-client-utils.c:387
+#: ../clients/common/nm-client-utils.c:428
msgid "DCB or FCoE setup failed"
msgstr "DCB または FCoE のセットアップに失敗しました"
-#: ../clients/common/nm-client-utils.c:389
+#: ../clients/common/nm-client-utils.c:430
msgid "teamd control failed"
msgstr "teamd の制御に失敗しました"
-#: ../clients/common/nm-client-utils.c:391
+#: ../clients/common/nm-client-utils.c:432
msgid "Modem failed or no longer available"
msgstr "モデムで障害が発生したか、モデムが利用できなくなりました"
-#: ../clients/common/nm-client-utils.c:393
+#: ../clients/common/nm-client-utils.c:434
msgid "Modem now ready and available"
msgstr "モデムが準備されましたので利用可能です"
-#: ../clients/common/nm-client-utils.c:395
+#: ../clients/common/nm-client-utils.c:436
msgid "SIM PIN was incorrect"
msgstr "SIM PIN が間違っています"
-#: ../clients/common/nm-client-utils.c:397
+#: ../clients/common/nm-client-utils.c:438
msgid "New connection activation was enqueued"
msgstr "新規接続アクティベーションがキューに格納されました"
-#: ../clients/common/nm-client-utils.c:399
+#: ../clients/common/nm-client-utils.c:440
msgid "The device's parent changed"
msgstr "デバイスの親が変更されました"
-#: ../clients/common/nm-client-utils.c:401
+#: ../clients/common/nm-client-utils.c:442
msgid "The device parent's management changed"
msgstr "デバイスの親の管理が変更されました"
-#: ../clients/common/nm-client-utils.c:403
+#: ../clients/common/nm-client-utils.c:444
msgid "OpenVSwitch database connection failed"
msgstr "OpenVSwitch データベースの接続に失敗しました"
-#: ../clients/common/nm-client-utils.c:405
+#: ../clients/common/nm-client-utils.c:446
msgid "A duplicate IP address was detected"
-msgstr ""
+msgstr "複製された IP アドレスが検出されました"
+
+#: ../clients/common/nm-client-utils.c:448
+msgid "The selected IP method is not supported"
+msgstr "選択された IP メソッドには対応していません"
#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:410
-#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
-#: ../libnm/nm-device.c:1572
+#: ../clients/common/nm-client-utils.c:452
+#: ../clients/common/nm-client-utils.c:491 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1354
msgid "Unknown"
msgstr "不明"
-#: ../clients/common/nm-client-utils.c:418
+#: ../clients/common/nm-client-utils.c:460
msgid "Unknown reason"
msgstr "不明な理由"
-#: ../clients/common/nm-client-utils.c:420
+#: ../clients/common/nm-client-utils.c:462
msgid "The connection was disconnected"
msgstr "接続が切断されました"
-#: ../clients/common/nm-client-utils.c:422
+#: ../clients/common/nm-client-utils.c:464
msgid "Disconnected by user"
msgstr "ユーザーにより切断"
-#: ../clients/common/nm-client-utils.c:424
+#: ../clients/common/nm-client-utils.c:466
msgid "The base network connection was interrupted"
msgstr "基本ネットワーク接続が中断されました。"
-#: ../clients/common/nm-client-utils.c:426
+#: ../clients/common/nm-client-utils.c:468
msgid "The VPN service stopped unexpectedly"
msgstr "VPN サービスが予期せず停止しました"
-#: ../clients/common/nm-client-utils.c:428
+#: ../clients/common/nm-client-utils.c:470
msgid "The VPN service returned invalid configuration"
msgstr "VPN サービスが無効な設定を返しました"
-#: ../clients/common/nm-client-utils.c:430
+#: ../clients/common/nm-client-utils.c:472
msgid "The connection attempt timed out"
msgstr "接続試行がタイムアウトしました"
-#: ../clients/common/nm-client-utils.c:432
+#: ../clients/common/nm-client-utils.c:474
msgid "The VPN service did not start in time"
msgstr "VPN サービスは時間内に開始しませんでした"
-#: ../clients/common/nm-client-utils.c:434
+#: ../clients/common/nm-client-utils.c:476
msgid "The VPN service failed to start"
msgstr "VPN サービスの開始に失敗しました"
-#: ../clients/common/nm-client-utils.c:436
+#: ../clients/common/nm-client-utils.c:478
msgid "No valid secrets"
msgstr "有効なシークレットはありません"
-#: ../clients/common/nm-client-utils.c:438
+#: ../clients/common/nm-client-utils.c:480
msgid "Invalid secrets"
msgstr "無効なシークレット"
-#: ../clients/common/nm-client-utils.c:440
+#: ../clients/common/nm-client-utils.c:482
msgid "The connection was removed"
msgstr "接続は削除されました"
-#: ../clients/common/nm-client-utils.c:442
+#: ../clients/common/nm-client-utils.c:484
msgid "Master connection failed"
msgstr "マスター接続に失敗しました"
-#: ../clients/common/nm-client-utils.c:444
+#: ../clients/common/nm-client-utils.c:486
msgid "Could not create a software link"
msgstr "ソフトウェアリンクを作成できませんでした"
-#: ../clients/common/nm-client-utils.c:446
+#: ../clients/common/nm-client-utils.c:488
msgid "The device disappeared"
msgstr "デバイスが消滅しました"
-#: ../clients/common/nm-meta-setting-access.c:501
+#: ../clients/common/nm-meta-setting-access.c:504
#, c-format
msgid "field '%s' has to be alone"
msgstr "フィールド '%s' は孤立する必要があります"
-#: ../clients/common/nm-meta-setting-access.c:516
+#: ../clients/common/nm-meta-setting-access.c:519
#, c-format
msgid "invalid field '%s%s%s%s%s'; %s%s%s"
msgstr "無効なフィールド '%s%s%s%s%s'; %s%s%s"
-#: ../clients/common/nm-meta-setting-desc.c:100
-#: ../clients/common/nm-meta-setting-desc.c:156
+#: ../clients/common/nm-meta-setting-desc.c:99
+#: ../clients/common/nm-meta-setting-desc.c:161
#, c-format
msgid "invalid prefix '%s'; <1-%d> allowed"
msgstr "無効なプレフィックス '%s'; <1-%d> 許可"
-#: ../clients/common/nm-meta-setting-desc.c:108
+#: ../clients/common/nm-meta-setting-desc.c:107
#, c-format
msgid "invalid IP address: %s"
msgstr "無効な IP アドレス: %s"
@@ -4395,267 +4430,238 @@ msgstr ""
"有効な構文は以下のようになります: 'ip[/prefix] [next-hop] [metric] "
"[attribute=val]... [,ip[/prefix] ...]'"
-#: ../clients/common/nm-meta-setting-desc.c:167
+#: ../clients/common/nm-meta-setting-desc.c:172
#, c-format
msgid "the next hop ('%s') must be first"
msgstr "次のホップ ('%s') が初回である必要があります"
-#: ../clients/common/nm-meta-setting-desc.c:173
+#: ../clients/common/nm-meta-setting-desc.c:178
#, c-format
msgid "the metric ('%s') must be before attributes"
msgstr "メトリック ('%s') が属性の前にある必要があります"
-#: ../clients/common/nm-meta-setting-desc.c:213
+#: ../clients/common/nm-meta-setting-desc.c:218
#, c-format
msgid "invalid route: %s. %s"
msgstr "無効なルート: %s. %s"
-#: ../clients/common/nm-meta-setting-desc.c:225
+#: ../clients/common/nm-meta-setting-desc.c:230
msgid "default route cannot be added (NetworkManager handles it by itself)"
msgstr "デフォルトのルートは追加できません (NetworkManager 自体が処理します)"
-#: ../clients/common/nm-meta-setting-desc.c:424
+#: ../clients/common/nm-meta-setting-desc.c:429
#, c-format
msgid "invalid priority map '%s'"
msgstr "無効な優先度マップ '%s'"
-#: ../clients/common/nm-meta-setting-desc.c:431
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:436
+#: ../clients/common/nm-meta-setting-desc.c:442
#, c-format
msgid "priority '%s' is not valid (<0-%ld>)"
msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:494
#, c-format
msgid "cannot read pac-script from file '%s'"
msgstr "ファイル '%s' から pac-script を読み込めません"
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:501
#, c-format
msgid "file '%s' contains non-valid utf-8"
msgstr "ファイル '%s' には無効な utf-8 が含まれています"
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:514
#, c-format
msgid "'%s' does not contain a valid PAC Script"
msgstr "'%s' には有効な PAC スクリプトが含まれていません"
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:517
#, c-format
msgid "Not a valid PAC Script"
msgstr "有効な PAC スクリプトではありません"
-#: ../clients/common/nm-meta-setting-desc.c:566
+#: ../clients/common/nm-meta-setting-desc.c:571
#, c-format
msgid "cannot read team config from file '%s'"
msgstr "ファイル '%s' からチーム設定を読み込めません"
-#: ../clients/common/nm-meta-setting-desc.c:573
+#: ../clients/common/nm-meta-setting-desc.c:578
#, c-format
msgid "team config file '%s' contains non-valid utf-8"
msgstr "チーム設定ファイル '%s' には無効な utf-8 が含まれています"
-#: ../clients/common/nm-meta-setting-desc.c:585
+#: ../clients/common/nm-meta-setting-desc.c:590
#, c-format
msgid "'%s' does not contain a valid team configuration"
msgstr "'%s' には有効なチーム設定が含まれていません"
-#: ../clients/common/nm-meta-setting-desc.c:588
+#: ../clients/common/nm-meta-setting-desc.c:593
#, c-format
msgid "team configuration must be a JSON object"
msgstr "チーム設定は JSON オブジェクトである必要があります"
-#: ../clients/common/nm-meta-setting-desc.c:682
+#: ../clients/common/nm-meta-setting-desc.c:714
#: ../clients/tui/nmt-mtu-entry.c:84
msgid "(default)"
msgstr "(デフォルト)"
-#: ../clients/common/nm-meta-setting-desc.c:797
+#: ../clients/common/nm-meta-setting-desc.c:834
msgid "auto"
msgstr "自動"
-#: ../clients/common/nm-meta-setting-desc.c:945
+#: ../clients/common/nm-meta-setting-desc.c:986
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../clients/common/nm-meta-setting-desc.c:1069
+#: ../clients/common/nm-meta-setting-desc.c:1110
#, c-format
msgid "'%s' is out of range [%lli, %lli]"
msgstr "'%s' は、[%lli, %lli] の範囲外です"
-#: ../clients/common/nm-meta-setting-desc.c:1075
+#: ../clients/common/nm-meta-setting-desc.c:1116
#, c-format
msgid "'%s' is not a valid number"
msgstr "'%s' は有効な数値ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:1125
+#: ../clients/common/nm-meta-setting-desc.c:1166
#, c-format
msgid "'%s' is out of range [0, %u]"
msgstr "'%s' は、[0, %u] の範囲外です"
-#: ../clients/common/nm-meta-setting-desc.c:1162
+#: ../clients/common/nm-meta-setting-desc.c:1202
#, c-format
msgid "'%s' is not a valid Ethernet MAC"
msgstr "'%s' は有効な Ethernet MAC ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:1181
-#, c-format
-msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s' は有効なフラグ番号ではありません。<0-%d> を使用してください"
-
-#: ../clients/common/nm-meta-setting-desc.c:1195
-#, c-format
-msgid "'%s' sum is higher than all flags => all flags set"
-msgstr ""
-"合計 '%s' がすべてのフラグよりも大きいです => すべてのフラグが設定されていま"
-"す"
-
-#: ../clients/common/nm-meta-setting-desc.c:1299
+#: ../clients/common/nm-meta-setting-desc.c:1306
#, c-format
msgid "invalid option '%s', use a combination of [%s]"
msgstr "無効なオプション '%s' です。[%s] の組み合わせを使用してください"
-#: ../clients/common/nm-meta-setting-desc.c:1304
-#: ../libnm-core/nm-keyfile-reader.c:623
+#: ../clients/common/nm-meta-setting-desc.c:1311 ../libnm-core/nm-keyfile.c:727
#, c-format
msgid "invalid option '%s', use one of [%s]"
msgstr "無効なオプション '%s' です。[%s] のいずれかを使用してください"
-#: ../clients/common/nm-meta-setting-desc.c:1427
+#: ../clients/common/nm-meta-setting-desc.c:1430
#, c-format
msgid "%d (key)"
msgstr "%d (key)"
-#: ../clients/common/nm-meta-setting-desc.c:1429
+#: ../clients/common/nm-meta-setting-desc.c:1432
#, c-format
msgid "%d (passphrase)"
msgstr "%d (パスフレーズ)"
-#: ../clients/common/nm-meta-setting-desc.c:1432
-#: ../clients/common/nm-meta-setting-desc.c:1521
+#: ../clients/common/nm-meta-setting-desc.c:1435
#, c-format
msgid "%d (unknown)"
msgstr "%d (不明)"
-#: ../clients/common/nm-meta-setting-desc.c:1464
+#: ../clients/common/nm-meta-setting-desc.c:1467
msgid "0 (NONE)"
msgstr "0 (なし)"
-#: ../clients/common/nm-meta-setting-desc.c:1470
+#: ../clients/common/nm-meta-setting-desc.c:1473
msgid "REORDER_HEADERS, "
msgstr "ヘッダーの順序変更、"
-#: ../clients/common/nm-meta-setting-desc.c:1472
+#: ../clients/common/nm-meta-setting-desc.c:1475
msgid "GVRP, "
msgstr "GVRP、"
-#: ../clients/common/nm-meta-setting-desc.c:1474
+#: ../clients/common/nm-meta-setting-desc.c:1477
msgid "LOOSE_BINDING, "
msgstr "ルースバインディング、"
-#: ../clients/common/nm-meta-setting-desc.c:1476
+#: ../clients/common/nm-meta-setting-desc.c:1479
msgid "MVRP, "
msgstr "MVRP、"
-#: ../clients/common/nm-meta-setting-desc.c:1515
-#, c-format
-msgid "%d (disabled)"
-msgstr "%d (無効)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1517
-#, c-format
-msgid "%d (enabled, prefer public IP)"
-msgstr "%d (有効、パブリック IP 優先)"
-
#: ../clients/common/nm-meta-setting-desc.c:1519
-#, c-format
-msgid "%d (enabled, prefer temporary IP)"
-msgstr "%d (有効、一時 IP を優先)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1534
msgid "0 (none)"
msgstr "0 (なし)"
-#: ../clients/common/nm-meta-setting-desc.c:1540
+#: ../clients/common/nm-meta-setting-desc.c:1525
msgid "agent-owned, "
msgstr "エージェント所有、 "
-#: ../clients/common/nm-meta-setting-desc.c:1542
+#: ../clients/common/nm-meta-setting-desc.c:1527
msgid "not saved, "
msgstr "未保存、 "
-#: ../clients/common/nm-meta-setting-desc.c:1544
+#: ../clients/common/nm-meta-setting-desc.c:1529
msgid "not required, "
msgstr "不必要、 "
-#: ../clients/common/nm-meta-setting-desc.c:1606
+#: ../clients/common/nm-meta-setting-desc.c:1594
#, c-format
msgid "'%s' is not valid; use <option>=<value>"
msgstr "'%s' は無効です; <option>=<value> を使用してください"
-#: ../clients/common/nm-meta-setting-desc.c:1648
+#: ../clients/common/nm-meta-setting-desc.c:1633
msgid "no item to remove"
msgstr "削除するアイテムがありません"
-#: ../clients/common/nm-meta-setting-desc.c:1652
+#: ../clients/common/nm-meta-setting-desc.c:1637
#, c-format
msgid "index '%d' is not in range <0-%d>"
msgstr "インデックス '%d' は範囲内にありません <0-%d>"
-#: ../clients/common/nm-meta-setting-desc.c:1667
+#: ../clients/common/nm-meta-setting-desc.c:1652
#, c-format
msgid "invalid option '%s'"
msgstr "無効なオプション '%s'"
-#: ../clients/common/nm-meta-setting-desc.c:1669
+#: ../clients/common/nm-meta-setting-desc.c:1654
msgid "missing option"
msgstr "足りないオプション"
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1678
#, c-format
msgid "'%s' is not a valid MAC"
msgstr "'%s' は有効な MAC ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:1723
-#: ../clients/common/nm-meta-setting-desc.c:1819
-#: ../clients/common/nm-meta-setting-desc.c:4667
+#: ../clients/common/nm-meta-setting-desc.c:1705
+#: ../clients/common/nm-meta-setting-desc.c:1802
+#: ../clients/common/nm-meta-setting-desc.c:4636
#, c-format
msgid "'%s' is not valid"
msgstr "'%s' は無効です"
-#: ../clients/common/nm-meta-setting-desc.c:1763
+#: ../clients/common/nm-meta-setting-desc.c:1746
#, c-format
msgid "'%u' flags are not valid; use combination of %s"
msgstr "'%u' フラグは有効ではありません。%s の組み合わせを使用してください"
-#: ../clients/common/nm-meta-setting-desc.c:1799
+#: ../clients/common/nm-meta-setting-desc.c:1782
#, c-format
msgid "'%s' is not a valid number (or out of range)"
msgstr "'%s' は有効な数字ではありません (または範囲外になります)"
-#: ../clients/common/nm-meta-setting-desc.c:1919
+#: ../clients/common/nm-meta-setting-desc.c:1901
#, c-format
msgid "'%s' is not a valid hex character"
msgstr "'%s' は有効な 16 進文字ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:2199
+#: ../clients/common/nm-meta-setting-desc.c:2190
#, c-format
msgid "the property doesn't contain EAP method '%s'"
msgstr "プロパティーには EAP メソッド '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:2222
+#: ../clients/common/nm-meta-setting-desc.c:2213
#, c-format
msgid "the property doesn't contain alternative subject match '%s'"
msgstr "プロパティーには代替のサブジェクトマッチ '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:2248
+#: ../clients/common/nm-meta-setting-desc.c:2239
#, c-format
msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
msgstr ""
"プロパティーには代替の \"phase2\" サブジェクトマッチ '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:2369
+#: ../clients/common/nm-meta-setting-desc.c:2361
#, c-format
msgid ""
"Enter a list of bonding options formatted as:\n"
@@ -4693,241 +4699,230 @@ msgstr ""
#. * hacky: we can not see if the type is already set, because
#. * nmc_setting_set_property() is called only after the property
#. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2429
+#: ../clients/common/nm-meta-setting-desc.c:2424
#, c-format
msgid "Can not change the connection type"
msgstr "接続タイプを変更できません"
-#: ../clients/common/nm-meta-setting-desc.c:2539
+#: ../clients/common/nm-meta-setting-desc.c:2529
#, c-format
msgid "the property doesn't contain permission '%s'"
msgstr "プロパティーにはパーミッション '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:2560
+#: ../clients/common/nm-meta-setting-desc.c:2550
#, c-format
msgid "'%s' is not valid master; use ifname or connection UUID"
msgstr ""
"'%s' は 有効なマスターではありません: ifname か、接続 UUID を使用してくださ"
"い。"
-#: ../clients/common/nm-meta-setting-desc.c:2659
+#: ../clients/common/nm-meta-setting-desc.c:2647
#, c-format
msgid "the value '%s' is not a valid UUID"
msgstr "値 '%s' は有効な UUID ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/common/nm-meta-setting-desc.c:2654
#, c-format
msgid "the property doesn't contain UUID '%s'"
msgstr "プロパティーには UUID '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:2733
+#: ../clients/common/nm-meta-setting-desc.c:2723
msgid "0 (disabled)"
msgstr "0 (無効)"
-#: ../clients/common/nm-meta-setting-desc.c:2739
+#: ../clients/common/nm-meta-setting-desc.c:2729
msgid "enabled, "
msgstr "有効、"
-#: ../clients/common/nm-meta-setting-desc.c:2741
+#: ../clients/common/nm-meta-setting-desc.c:2731
msgid "advertise, "
msgstr "公表、"
-#: ../clients/common/nm-meta-setting-desc.c:2743
+#: ../clients/common/nm-meta-setting-desc.c:2733
msgid "willing, "
msgstr "用意がある、"
-#: ../clients/common/nm-meta-setting-desc.c:2863
+#: ../clients/common/nm-meta-setting-desc.c:2855
#, c-format
msgid "'%s' is not a valid DCB flag"
msgstr "'%s' は有効な DCB フラグではありません"
-#: ../clients/common/nm-meta-setting-desc.c:2893
+#: ../clients/common/nm-meta-setting-desc.c:2884
msgid "must contain 8 comma-separated numbers"
msgstr "コンマで区切った 8 つの番号を含ませてください"
-#: ../clients/common/nm-meta-setting-desc.c:2909
+#: ../clients/common/nm-meta-setting-desc.c:2900
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive) or %u"
msgstr "'%s' は 0 と %u (含む) または %u の間の数ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2903
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive)"
msgstr "'%s' は 0 と %u (含む) の間の数ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:2933
+#: ../clients/common/nm-meta-setting-desc.c:2924
#, c-format
msgid "changes will have no effect until '%s' includes 1 (enabled)"
msgstr "変更は、'%s' に 1 (有効) が含まれるまで効果はありません"
-#: ../clients/common/nm-meta-setting-desc.c:2988
+#: ../clients/common/nm-meta-setting-desc.c:2979
#, c-format
msgid "bandwidth percentages must total 100%%"
msgstr "帯域幅のパーセンテージの合計は 100%% にならなければなりません"
-#: ../clients/common/nm-meta-setting-desc.c:3061
-#: ../clients/common/nm-meta-setting-desc.c:3067
+#: ../clients/common/nm-meta-setting-desc.c:3052
+#: ../clients/common/nm-meta-setting-desc.c:3058
msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
msgstr ""
"SIM オペレーター IDは、5 桁または 6 桁の数字の MCCMNC コードである必要があり"
"ます"
-#: ../clients/common/nm-meta-setting-desc.c:3091
+#: ../clients/common/nm-meta-setting-desc.c:3082
#, c-format
msgid "'%s' is not a valid IBoIP P_Key"
msgstr "'%s' は有効な IBoIP P_Key ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:3114
+#: ../clients/common/nm-meta-setting-desc.c:3105
msgid "default"
msgstr "デフォルト"
-#: ../clients/common/nm-meta-setting-desc.c:3248
-#: ../clients/common/nm-meta-setting-desc.c:3267
+#: ../clients/common/nm-meta-setting-desc.c:3244
+#: ../clients/common/nm-meta-setting-desc.c:3261
#, c-format
msgid "invalid IPv4 address '%s'"
msgstr "無効な IPv4 アドレス '%s'"
-#: ../clients/common/nm-meta-setting-desc.c:3273
-#: ../clients/common/nm-meta-setting-desc.c:3527
+#: ../clients/common/nm-meta-setting-desc.c:3267
+#: ../clients/common/nm-meta-setting-desc.c:3511
#, c-format
msgid "the property doesn't contain DNS server '%s'"
msgstr "プロパティーには DNS サーバー '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3313
-#: ../clients/common/nm-meta-setting-desc.c:3567
+#: ../clients/common/nm-meta-setting-desc.c:3305
+#: ../clients/common/nm-meta-setting-desc.c:3549
#, c-format
msgid "the property doesn't contain DNS search domain '%s'"
msgstr "プロパティーには DNS 検索ドメイン '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3350
-#: ../clients/common/nm-meta-setting-desc.c:3604
+#: ../clients/common/nm-meta-setting-desc.c:3342
+#: ../clients/common/nm-meta-setting-desc.c:3586
#, c-format
msgid "the property doesn't contain DNS option '%s'"
msgstr "プロパティーには DNS オプション '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3393
-#: ../clients/common/nm-meta-setting-desc.c:3653
+#: ../clients/common/nm-meta-setting-desc.c:3385
+#: ../clients/common/nm-meta-setting-desc.c:3635
#, c-format
msgid "the property doesn't contain IP address '%s'"
msgstr "プロパティーには IP アドレス '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3672
+#: ../clients/common/nm-meta-setting-desc.c:3405
+#: ../clients/common/nm-meta-setting-desc.c:3654
#, c-format
msgid "invalid gateway address '%s'"
msgstr "無効なゲートウェイアドレス '%s'"
-#: ../clients/common/nm-meta-setting-desc.c:3452
-#: ../clients/common/nm-meta-setting-desc.c:3713
+#: ../clients/common/nm-meta-setting-desc.c:3444
+#: ../clients/common/nm-meta-setting-desc.c:3695
#, c-format
msgid "the property doesn't contain route '%s'"
msgstr "プロパティーにはルート '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3502
-#: ../clients/common/nm-meta-setting-desc.c:3521
+#: ../clients/common/nm-meta-setting-desc.c:3488
+#: ../clients/common/nm-meta-setting-desc.c:3505
#, c-format
msgid "invalid IPv6 address '%s'"
msgstr "無効な IPv6 アドレス '%s'"
-#: ../clients/common/nm-meta-setting-desc.c:3731
-#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
-#, c-format
-msgid "'%s' is not a number"
-msgstr "'%s' は数字ではありません"
-
-#: ../clients/common/nm-meta-setting-desc.c:3738
-#, c-format
-msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "'%s' は無効です。0、1、2 のいずれかを使用してください。"
-
-#: ../clients/common/nm-meta-setting-desc.c:3772
+#: ../clients/common/nm-meta-setting-desc.c:3732
#, c-format
msgid "'%s' is not a valid channel; use <1-13>"
msgstr "'%s' は有効なチャンネルではありません。<1-13> を使用してください"
-#: ../clients/common/nm-meta-setting-desc.c:3832
+#: ../clients/common/nm-meta-setting-desc.c:3793
msgid ""
"The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-msgstr ""
+msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-#: ../clients/common/nm-meta-setting-desc.c:3855
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3816
+#, c-format
msgid "the property doesn't contain qdisc '%s'"
-msgstr "プロパティーには UUID '%s' が含まれません"
+msgstr "プロパティーには qdisc '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3908
+#: ../clients/common/nm-meta-setting-desc.c:3870
msgid ""
"The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
-msgstr ""
+msgstr "有効な構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
-#: ../clients/common/nm-meta-setting-desc.c:3931
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3893
+#, c-format
msgid "the property doesn't contain tfilter '%s'"
-msgstr "プロパティーにはルート '%s' が含まれません"
+msgstr "プロパティーには tfilter '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:3992
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3960
+#, c-format
msgid "the property doesn't contain string '%s'"
-msgstr "プロパティーにはマッピング '%s' が含まれません"
+msgstr "プロパティーには文字列 '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:4065
-#: ../clients/common/nm-meta-setting-desc.c:4137
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4035
+#: ../clients/common/nm-meta-setting-desc.c:4109
+#, c-format
msgid "the property doesn't contain link watcher '%s'"
-msgstr "プロパティーにはルート '%s' が含まれません"
+msgstr "プロパティーにはリンクウォッチャー '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:4228
+#: ../clients/common/nm-meta-setting-desc.c:4215
#, c-format
msgid "only one mapping at a time is supported; taking the first one (%s)"
msgstr ""
"マッピングは一度に 1 つだけ行います。最初のマッピング (%s) を行います。"
-#: ../clients/common/nm-meta-setting-desc.c:4236
+#: ../clients/common/nm-meta-setting-desc.c:4223
#, c-format
msgid "the property doesn't contain mapping '%s'"
msgstr "プロパティーにはマッピング '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:4244
+#: ../clients/common/nm-meta-setting-desc.c:4231
msgid "no priority to remove"
msgstr "削除する優先度がありません"
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4235
#, c-format
msgid "index '%d' is not in the range of <0-%d>"
msgstr "インデックス '%d' は <0-%d> の範囲内にありません"
-#: ../clients/common/nm-meta-setting-desc.c:4317
+#: ../clients/common/nm-meta-setting-desc.c:4304
#, c-format
msgid "'%s' cannot be empty"
msgstr "'%s' を空白にすることはできません"
-#: ../clients/common/nm-meta-setting-desc.c:4356
-#: ../clients/common/nm-meta-setting-desc.c:4489
-#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
-#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
-#: ../libnm-util/nm-setting-wireless.c:859
-#: ../libnm-util/nm-setting-wireless.c:873
+#: ../clients/common/nm-meta-setting-desc.c:4343
+#: ../clients/common/nm-meta-setting-desc.c:4474
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:859
+#: ../libnm-core/nm-setting-wireless.c:871 ../libnm-util/nm-setting-wired.c:645
+#: ../libnm-util/nm-setting-wireless.c:858
+#: ../libnm-util/nm-setting-wireless.c:872
#, c-format
msgid "'%s' is not a valid MAC address"
msgstr "'%s' は有効な MAC アドレスではありません"
-#: ../clients/common/nm-meta-setting-desc.c:4362
-#: ../clients/common/nm-meta-setting-desc.c:4495
+#: ../clients/common/nm-meta-setting-desc.c:4349
+#: ../clients/common/nm-meta-setting-desc.c:4480
#, c-format
msgid "the property doesn't contain MAC address '%s'"
msgstr "プロパティーには MAC アドレス '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:4380
+#: ../clients/common/nm-meta-setting-desc.c:4367
#, c-format
msgid "'%s' is not valid; 2 or 3 strings should be provided"
msgstr "'%s' は無効です。2 文字または 3 文字の文字列を入力してください"
-#: ../clients/common/nm-meta-setting-desc.c:4396
+#: ../clients/common/nm-meta-setting-desc.c:4381
#, c-format
msgid "'%s' string value should consist of 1 - 199 characters"
msgstr "'%s' 文字列値は 1 - 199 の文字で構成される必要があります"
-#: ../clients/common/nm-meta-setting-desc.c:4428
+#: ../clients/common/nm-meta-setting-desc.c:4413
#, c-format
msgid ""
"Enter a list of S/390 options formatted as:\n"
@@ -4938,24 +4933,24 @@ msgstr ""
" option = <value>, option = <value>,...\n"
"次が有効なオプションになります: %s\n"
-#: ../clients/common/nm-meta-setting-desc.c:4462
+#: ../clients/common/nm-meta-setting-desc.c:4447
#, c-format
msgid "'%s' is not a valid channel"
msgstr "'%s' は有効なチャンネルではありません"
-#: ../clients/common/nm-meta-setting-desc.c:4468
+#: ../clients/common/nm-meta-setting-desc.c:4453
#, c-format
msgid "'%ld' is not a valid channel"
msgstr "'%ld' は有効なチャンネルではありません"
-#: ../clients/common/nm-meta-setting-desc.c:4567
-#: ../clients/common/nm-meta-setting-desc.c:4603
-#: ../clients/common/nm-meta-setting-desc.c:4639
+#: ../clients/common/nm-meta-setting-desc.c:4536
+#: ../clients/common/nm-meta-setting-desc.c:4572
+#: ../clients/common/nm-meta-setting-desc.c:4608
#, c-format
msgid "the property doesn't contain protocol '%s'"
msgstr "プロパティーにはプロトコル '%s' が含まれません"
-#: ../clients/common/nm-meta-setting-desc.c:4676
+#: ../clients/common/nm-meta-setting-desc.c:4645
#, c-format
msgid ""
"'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -4964,57 +4959,57 @@ msgstr ""
"'%s' と %s '%s' は互換性がありません。キーを変更するか、適切な %s を最初に設"
"定してください。"
-#: ../clients/common/nm-meta-setting-desc.c:4686
+#: ../clients/common/nm-meta-setting-desc.c:4655
#, c-format
msgid "WEP key is guessed to be of '%s'"
msgstr "WEP キーは '%s' であると仮定しています"
-#: ../clients/common/nm-meta-setting-desc.c:4691
+#: ../clients/common/nm-meta-setting-desc.c:4660
#, c-format
msgid "WEP key index set to '%d'"
msgstr "WEP キーインデックスは '%d' に設定されます"
-#: ../clients/common/nm-meta-setting-desc.c:4730
+#: ../clients/common/nm-meta-setting-desc.c:4699
#, c-format
msgid "'%s' is not compatible with '%s' type, please change or delete the key."
msgstr ""
"'%s' は '%s' タイプと互換性がありません。キーを変更するか、削除してください。"
-#: ../clients/common/nm-meta-setting-desc.c:4740
+#: ../clients/common/nm-meta-setting-desc.c:4709
#, c-format
msgid "'%s' is not a valid PSK"
msgstr "'%s' は有効な PSK ではありません"
-#: ../clients/common/nm-meta-setting-desc.c:4772
+#: ../clients/common/nm-meta-setting-desc.c:4741
msgid "Bonding primary interface [none]"
msgstr "ボンドのプライマリインターフェース [none]"
#. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4779
+#: ../clients/common/nm-meta-setting-desc.c:4748
msgid "Bonding monitoring mode"
msgstr "ボンディングモニタリングモード"
-#: ../clients/common/nm-meta-setting-desc.c:4788
+#: ../clients/common/nm-meta-setting-desc.c:4757
msgid "Bonding miimon [100]"
msgstr "ボンドの miimon [100]"
-#: ../clients/common/nm-meta-setting-desc.c:4796
+#: ../clients/common/nm-meta-setting-desc.c:4765
msgid "Bonding downdelay [0]"
msgstr "ボンドの downdelay [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4804
+#: ../clients/common/nm-meta-setting-desc.c:4773
msgid "Bonding updelay [0]"
msgstr "ボンドの updelay [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4812
+#: ../clients/common/nm-meta-setting-desc.c:4781
msgid "Bonding arp-interval [0]"
msgstr "ボンドの arp-interval [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4820
+#: ../clients/common/nm-meta-setting-desc.c:4789
msgid "Bonding arp-ip-target [none]"
msgstr "ボンドの arp-ip-target [none]"
-#: ../clients/common/nm-meta-setting-desc.c:4828
+#: ../clients/common/nm-meta-setting-desc.c:4797
msgid "LACP rate ('slow' or 'fast') [slow]"
msgstr "LACP レート ('slow' または 'fast') [slow]"
@@ -5022,7 +5017,7 @@ msgstr "LACP レート ('slow' または 'fast') [slow]"
#. * that the actual type is (gboolean(*)(type *)).
#. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
#. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:4910
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 "
@@ -5034,13 +5029,13 @@ msgid ""
msgstr ""
"nmcli では、JSON 設定データそのものと、設定を含むファイルの名前の両方を受け取"
"ることができます。設定を含むファイルの名前を指定した場合は、そのファイルが読"
-"み込まれ、コンテンツがこのプロパティに置かれます。\n"
+"み込まれ、コンテンツがこのプロパティーに置かれます。\n"
"\n"
"例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
" set team.config /etc/my-team.conf\n"
-#: ../clients/common/nm-meta-setting-desc.c:4948
+#: ../clients/common/nm-meta-setting-desc.c:4918
msgid ""
"Enter a list of link watchers formatted as dictionaries where the keys are "
"teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5057,16 +5052,39 @@ msgid ""
"\n"
"Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
"and:\n"
-" 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
+" 'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
"\n"
"Properties flagged with a '*' are mandatory.\n"
"\n"
"Example:\n"
-" name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
-"name=ethtool,delay-up=3\n"
-msgstr ""
+" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
+msgstr ""
+"キーが teamd のプロパティーになっているディクショナリーの形式で、リンクウォッ"
+"チャーの一覧を入力します。ディクショナリーのペアの書式は key=value となり、区"
+"切る時は半角スペースを使用します。ディクショナリーを区切る時はコンマ ',' を使"
+"用します。ディクショナリーで利用できるキーまたは必要なキーは、リンクウォッ"
+"チャーのタイプによって異なります。すべてのリンクウォッチャーに共通して\"いる"
+"唯一のプロパティーは 'name'* で、これで指定するリンクウォッチャーを定義しま"
+"す。\n"
+"\n"
+"'ethtool' リンクウォッチャーに利用できるプロパティー:\n"
+" 'delay-up'、'delay-down'\n"
+"\n"
+"'nsna_ping' リンクウォッチャーに利用できるプロパティー:\n"
+" 'init-wait'、'interval'、'missed-max'、'target-host'*\n"
+"\n"
+"'arp_ping' には、'nsna_ping' の全プロパティーと下記プロパティーが利用できま"
+"す:\n"
+" 'source-host'*、'validate-active'、'validate-inactive'、'send-always'\n"
+"\n"
+"'*' がついたプロパティーは必須です。\n"
+"\n"
+"例:\n"
+" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
-#: ../clients/common/nm-meta-setting-desc.c:4999
+#: ../clients/common/nm-meta-setting-desc.c:4968
msgid ""
"Enter file path to CA certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -5080,7 +5098,7 @@ msgstr ""
"い。\n"
"例: /home/cimrman/cacert.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5033
+#: ../clients/common/nm-meta-setting-desc.c:5002
msgid ""
"Enter file path to client certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -5094,7 +5112,7 @@ msgstr ""
"い。\n"
"例: /home/cimrman/jara.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5090
+#: ../clients/common/nm-meta-setting-desc.c:5059
msgid ""
"Enter file path to CA certificate for inner authentication (optionally "
"prefixed\n"
@@ -5111,7 +5129,7 @@ msgstr ""
"い。\n"
"例: /home/cimrman/ca-zweite-phase.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5125
+#: ../clients/common/nm-meta-setting-desc.c:5094
msgid ""
"Enter file path to client certificate for inner authentication (optionally "
"prefixed\n"
@@ -5128,7 +5146,7 @@ msgstr ""
"い。\n"
"例: /home/cimrman/jara-zweite-phase.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5152
+#: ../clients/common/nm-meta-setting-desc.c:5121
msgid ""
"Enter bytes as a list of hexadecimal values.\n"
"Two formats are accepted:\n"
@@ -5149,8 +5167,8 @@ msgstr ""
"例: ab0455a6ea3a74C2\n"
" ab 4 55 0xa6 ea 3a 74 C2\n"
-#: ../clients/common/nm-meta-setting-desc.c:5169
-#: ../clients/common/nm-meta-setting-desc.c:5187
+#: ../clients/common/nm-meta-setting-desc.c:5138
+#: ../clients/common/nm-meta-setting-desc.c:5156
msgid ""
"Enter path to a private key and the key password (if not set yet):\n"
" [file://]<file path> [<password>]\n"
@@ -5164,83 +5182,83 @@ msgstr ""
"してください。\n"
"例: /home/cimrman/jara-priv-key Dardanely\n"
-#: ../clients/common/nm-meta-setting-desc.c:5226
-#: ../clients/common/nm-secret-agent-simple.c:234
-#: ../clients/common/nm-secret-agent-simple.c:332
+#: ../clients/common/nm-meta-setting-desc.c:5195
+#: ../clients/common/nm-secret-agent-simple.c:249
+#: ../clients/common/nm-secret-agent-simple.c:347
#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
msgid "Username"
msgstr "ユーザー名"
-#: ../clients/common/nm-meta-setting-desc.c:5232
-#: ../clients/common/nm-meta-setting-desc.c:5416
-#: ../clients/common/nm-meta-setting-desc.c:5699
+#: ../clients/common/nm-meta-setting-desc.c:5201
+#: ../clients/common/nm-meta-setting-desc.c:5385
+#: ../clients/common/nm-meta-setting-desc.c:5676
#: ../clients/common/nm-meta-setting-desc.c:6323
msgid "Password [none]"
msgstr "パスワード [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5278
+#: ../clients/common/nm-meta-setting-desc.c:5247
msgid "Bluetooth device address"
msgstr "Bluetooth デバイスアドレス"
-#: ../clients/common/nm-meta-setting-desc.c:5323
-#: ../clients/common/nm-meta-setting-desc.c:5753
-#: ../clients/common/nm-meta-setting-desc.c:7030
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7205
+#: ../clients/common/nm-meta-setting-desc.c:5292
+#: ../clients/common/nm-meta-setting-desc.c:5730
+#: ../clients/common/nm-meta-setting-desc.c:7031
+#: ../clients/common/nm-meta-setting-desc.c:7069
+#: ../clients/common/nm-meta-setting-desc.c:7206
msgid "MAC [none]"
msgstr "MAC [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5329
+#: ../clients/common/nm-meta-setting-desc.c:5298
msgid "Enable STP [no]"
msgstr "STP の有効化 [no]"
-#: ../clients/common/nm-meta-setting-desc.c:5335
+#: ../clients/common/nm-meta-setting-desc.c:5304
msgid "STP priority [32768]"
msgstr "STP の優先度 [32768]"
-#: ../clients/common/nm-meta-setting-desc.c:5341
+#: ../clients/common/nm-meta-setting-desc.c:5310
msgid "Forward delay [15]"
msgstr "フォワード遅延 [15]"
-#: ../clients/common/nm-meta-setting-desc.c:5347
+#: ../clients/common/nm-meta-setting-desc.c:5316
msgid "Hello time [2]"
msgstr "Hello タイム [2]"
-#: ../clients/common/nm-meta-setting-desc.c:5353
+#: ../clients/common/nm-meta-setting-desc.c:5322
msgid "Max age [20]"
msgstr "最大エイジ [20]"
-#: ../clients/common/nm-meta-setting-desc.c:5359
+#: ../clients/common/nm-meta-setting-desc.c:5328
msgid "MAC address ageing time [300]"
msgstr "MAC アドレスのエージングタイム [300]"
-#: ../clients/common/nm-meta-setting-desc.c:5365
+#: ../clients/common/nm-meta-setting-desc.c:5334
msgid "Group forward mask [0]"
msgstr "グループの前方マスク [0]"
-#: ../clients/common/nm-meta-setting-desc.c:5371
+#: ../clients/common/nm-meta-setting-desc.c:5340
msgid "Enable IGMP snooping [no]"
msgstr "IGMP スヌーピングの有効化 [no]"
-#: ../clients/common/nm-meta-setting-desc.c:5383
+#: ../clients/common/nm-meta-setting-desc.c:5352
msgid "Bridge port priority [32]"
msgstr "ブリッジポートの優先度 [32]"
-#: ../clients/common/nm-meta-setting-desc.c:5389
+#: ../clients/common/nm-meta-setting-desc.c:5358
msgid "Bridge port STP path cost [100]"
msgstr "ブリッジポートの STP パスコスト [100]"
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5364
msgid "Hairpin [no]"
msgstr "ヘアピン [no]"
-#: ../clients/common/nm-meta-setting-desc.c:5410
-#: ../clients/common/nm-meta-setting-desc.c:5693
-#: ../clients/common/nm-meta-setting-desc.c:6920
+#: ../clients/common/nm-meta-setting-desc.c:5379
+#: ../clients/common/nm-meta-setting-desc.c:5670
+#: ../clients/common/nm-meta-setting-desc.c:6921
msgid "Username [none]"
msgstr "ユーザー名 [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5505
+#: ../clients/common/nm-meta-setting-desc.c:5474
msgid ""
"Enter a list of user permissions. This is a list of user names formatted "
"as:\n"
@@ -5255,7 +5273,7 @@ msgstr ""
"\n"
"例: alice bob charlie\n"
-#: ../clients/common/nm-meta-setting-desc.c:5547
+#: ../clients/common/nm-meta-setting-desc.c:5516
msgid ""
"Enter secondary connections that should be activated when this connection "
"is\n"
@@ -5277,7 +5295,7 @@ msgstr ""
"\n"
"例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-#: ../clients/common/nm-meta-setting-desc.c:5564
+#: ../clients/common/nm-meta-setting-desc.c:5533
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"
@@ -5292,25 +5310,25 @@ msgstr ""
"NetworkManager でヒューリスティックを使用して値を選択できるようにする場合は "
"'unknown'\n"
-#: ../clients/common/nm-meta-setting-desc.c:5710
+#: ../clients/common/nm-meta-setting-desc.c:5687
msgid "APN"
msgstr "APN"
-#: ../clients/common/nm-meta-setting-desc.c:5762
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7239
+#: ../clients/common/nm-meta-setting-desc.c:5739
+#: ../clients/common/nm-meta-setting-desc.c:7094
+#: ../clients/common/nm-meta-setting-desc.c:7240
msgid "MTU [auto]"
msgstr "MTU [auto]"
-#: ../clients/common/nm-meta-setting-desc.c:5781
+#: ../clients/common/nm-meta-setting-desc.c:5758
msgid "P_KEY [none]"
msgstr "P_KEY [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5790
+#: ../clients/common/nm-meta-setting-desc.c:5767
msgid "Parent interface [none]"
msgstr "親インターフェース [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:5790
msgid ""
"Enter a list of IPv4 addresses of DNS servers.\n"
"\n"
@@ -5320,11 +5338,11 @@ msgstr ""
"\n"
"例: 8.8.8.8, 8.8.4.4\n"
-#: ../clients/common/nm-meta-setting-desc.c:5845
+#: ../clients/common/nm-meta-setting-desc.c:5822
msgid "IPv4 address (IP[/plen]) [none]"
msgstr "IPv4 アドレス (IP[/plen]) [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5847
+#: ../clients/common/nm-meta-setting-desc.c:5824
msgid ""
"Enter a list of IPv4 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
@@ -5338,11 +5356,11 @@ msgstr ""
"\n"
"例: 192.168.1.5/24, 10.0.0.11/24\n"
-#: ../clients/common/nm-meta-setting-desc.c:5860
+#: ../clients/common/nm-meta-setting-desc.c:5837
msgid "IPv4 gateway [none]"
msgstr "IPv4 ゲートウェイ [none]"
-#: ../clients/common/nm-meta-setting-desc.c:5868
+#: ../clients/common/nm-meta-setting-desc.c:5845
msgid ""
"Enter a list of IPv4 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n"
@@ -5365,7 +5383,7 @@ msgstr ""
"例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
" 10.1.2.0/24\n"
-#: ../clients/common/nm-meta-setting-desc.c:5970
+#: ../clients/common/nm-meta-setting-desc.c:5947
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 "
@@ -5384,11 +5402,11 @@ msgstr ""
"\n"
"例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-#: ../clients/common/nm-meta-setting-desc.c:6008
+#: ../clients/common/nm-meta-setting-desc.c:5985
msgid "IPv6 address (IP[/plen]) [none]"
msgstr "IPv6 アドレス (IP[/plen]) [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6010
+#: ../clients/common/nm-meta-setting-desc.c:5987
msgid ""
"Enter a list of IPv6 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
@@ -5402,11 +5420,11 @@ msgstr ""
"\n"
"例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-#: ../clients/common/nm-meta-setting-desc.c:6023
+#: ../clients/common/nm-meta-setting-desc.c:6000
msgid "IPv6 gateway [none]"
msgstr "IPv6 ゲートウェイ [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6031
+#: ../clients/common/nm-meta-setting-desc.c:6008
msgid ""
"Enter a list of IPv6 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n"
@@ -5431,38 +5449,38 @@ msgstr ""
"beef::3 2\n"
" abbe::/64 55\n"
-#: ../clients/common/nm-meta-setting-desc.c:6124
-#: ../clients/common/nm-meta-setting-desc.c:6953
+#: ../clients/common/nm-meta-setting-desc.c:6113
+#: ../clients/common/nm-meta-setting-desc.c:6954
msgid "Parent device [none]"
msgstr "親デバイス [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6130
+#: ../clients/common/nm-meta-setting-desc.c:6119
msgid "Local endpoint [none]"
msgstr "ローカルエンドポイント [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6137
-#: ../clients/common/nm-meta-setting-desc.c:6973
+#: ../clients/common/nm-meta-setting-desc.c:6126
+#: ../clients/common/nm-meta-setting-desc.c:6974
msgid "Remote"
msgstr "リモート"
-#: ../clients/common/nm-meta-setting-desc.c:6174
+#: ../clients/common/nm-meta-setting-desc.c:6171
msgid "MACsec parent device or connection UUID"
msgstr "MACsec 親デバイスまたは接続 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:6195
+#: ../clients/common/nm-meta-setting-desc.c:6192
msgid "Enable encryption [yes]"
msgstr "暗号化の有効化 [yes]"
-#: ../clients/common/nm-meta-setting-desc.c:6201
-#: ../clients/common/nm-secret-agent-simple.c:523
+#: ../clients/common/nm-meta-setting-desc.c:6198
+#: ../clients/common/nm-secret-agent-simple.c:534
msgid "MKA CAK"
msgstr "MKA CAK"
-#: ../clients/common/nm-meta-setting-desc.c:6211
+#: ../clients/common/nm-meta-setting-desc.c:6208
msgid "MKA_CKN"
msgstr "MKA_CKN"
-#: ../clients/common/nm-meta-setting-desc.c:6217
+#: ../clients/common/nm-meta-setting-desc.c:6214
msgid "SCI port [1]"
msgstr "SCI ポート [1]"
@@ -5475,7 +5493,7 @@ msgid "Tap [no]"
msgstr "Tap [no]"
#: ../clients/common/nm-meta-setting-desc.c:6274
-#: ../clients/common/nm-meta-setting-desc.c:7160
+#: ../clients/common/nm-meta-setting-desc.c:7161
#: ../clients/tui/nmt-page-wifi.c:224
msgid "SSID"
msgstr "SSID"
@@ -5513,80 +5531,80 @@ msgid "PAC script"
msgstr "PAC スクリプト"
#: ../clients/common/nm-meta-setting-desc.c:6538
-#: ../clients/common/nm-meta-setting-desc.c:6686
+#: ../clients/common/nm-meta-setting-desc.c:6687
msgid "Team JSON configuration [none]"
msgstr "team JSON 設定 [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6823
+#: ../clients/common/nm-meta-setting-desc.c:6824
msgid "User ID [none]"
msgstr "ユーザー ID [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6829
+#: ../clients/common/nm-meta-setting-desc.c:6830
msgid "Group ID [none]"
msgstr "グループ ID [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:6836
msgid "Enable PI [no]"
msgstr "PI の有効化 [no]"
-#: ../clients/common/nm-meta-setting-desc.c:6841
+#: ../clients/common/nm-meta-setting-desc.c:6842
msgid "Enable VNET header [no]"
msgstr "VNET ヘッダー の有効化 [no]"
-#: ../clients/common/nm-meta-setting-desc.c:6847
+#: ../clients/common/nm-meta-setting-desc.c:6848
msgid "Enable multi queue [no]"
msgstr "複数のキューの有効化 [no]"
-#: ../clients/common/nm-meta-setting-desc.c:6860
+#: ../clients/common/nm-meta-setting-desc.c:6861
msgid "VLAN parent device or connection UUID"
msgstr "VLAN 親デバイスまたは接続 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:6867
+#: ../clients/common/nm-meta-setting-desc.c:6868
msgid "VLAN ID (<0-4094>)"
msgstr "VLAN ID (<0-4094>)"
-#: ../clients/common/nm-meta-setting-desc.c:6873
+#: ../clients/common/nm-meta-setting-desc.c:6874
msgid "VLAN flags (<0-7>) [none]"
msgstr "VLAN フラグ (<0-7>) [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:6883
msgid "Ingress priority maps [none]"
msgstr "イングレス優先度マップ [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6892
+#: ../clients/common/nm-meta-setting-desc.c:6893
msgid "Egress priority maps [none]"
msgstr "イーグレス優先度マップ [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6960
+#: ../clients/common/nm-meta-setting-desc.c:6961
msgid "VXLAN ID"
msgstr "VXLAN ID"
-#: ../clients/common/nm-meta-setting-desc.c:6966
+#: ../clients/common/nm-meta-setting-desc.c:6967
msgid "Local address [none]"
msgstr "ローカルアドレス [none]"
-#: ../clients/common/nm-meta-setting-desc.c:6979
+#: ../clients/common/nm-meta-setting-desc.c:6980
msgid "Minimum source port [0]"
msgstr "最小ソースポート数 [0]"
-#: ../clients/common/nm-meta-setting-desc.c:6985
+#: ../clients/common/nm-meta-setting-desc.c:6986
msgid "Maximum source port [0]"
msgstr "最大ソースポート数 [0]"
-#: ../clients/common/nm-meta-setting-desc.c:6991
+#: ../clients/common/nm-meta-setting-desc.c:6992
msgid "Destination port [8472]"
msgstr "接続先ポート [8472]"
-#: ../clients/common/nm-meta-setting-desc.c:7037
+#: ../clients/common/nm-meta-setting-desc.c:7038
msgid "WiMAX NSP name"
msgstr "WiMAX NSP 名"
-#: ../clients/common/nm-meta-setting-desc.c:7074
-#: ../clients/common/nm-meta-setting-desc.c:7210
+#: ../clients/common/nm-meta-setting-desc.c:7075
+#: ../clients/common/nm-meta-setting-desc.c:7211
msgid "Cloned MAC [none]"
-msgstr "クローンしたMAC [none]"
+msgstr "クローンした MAC [none]"
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7102
msgid ""
"Enter a list of subchannels (comma or space separated).\n"
"\n"
@@ -5596,7 +5614,7 @@ msgstr ""
"\n"
"例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-#: ../clients/common/nm-meta-setting-desc.c:7355
+#: ../clients/common/nm-meta-setting-desc.c:7370
msgid ""
"Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
"and 2 or passphrase.\n"
@@ -5605,181 +5623,181 @@ msgstr ""
"key、2 または passphrase です。\n"
#. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7515
+#: ../clients/common/nm-meta-setting-desc.c:7538
msgid "802-1x settings"
msgstr "802-1x 設定"
-#: ../clients/common/nm-meta-setting-desc.c:7516
-#: ../src/devices/adsl/nm-device-adsl.c:137
+#: ../clients/common/nm-meta-setting-desc.c:7539
+#: ../src/devices/adsl/nm-device-adsl.c:135
msgid "ADSL connection"
msgstr "ADSL 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7517
+#: ../clients/common/nm-meta-setting-desc.c:7540
msgid "bluetooth connection"
msgstr "bluetooth 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7518
+#: ../clients/common/nm-meta-setting-desc.c:7541
msgid "Bond device"
msgstr "Bond デバイス"
-#: ../clients/common/nm-meta-setting-desc.c:7519
+#: ../clients/common/nm-meta-setting-desc.c:7542
msgid "Bridge device"
msgstr "ブリッジデバイス"
-#: ../clients/common/nm-meta-setting-desc.c:7520
+#: ../clients/common/nm-meta-setting-desc.c:7543
msgid "Bridge port"
msgstr "ブリッジポート"
-#: ../clients/common/nm-meta-setting-desc.c:7521
+#: ../clients/common/nm-meta-setting-desc.c:7544
msgid "CDMA mobile broadband connection"
msgstr "CDMA モバイルブロードバンド接続"
-#: ../clients/common/nm-meta-setting-desc.c:7522
+#: ../clients/common/nm-meta-setting-desc.c:7545
msgid "General settings"
msgstr "一般設定"
-#: ../clients/common/nm-meta-setting-desc.c:7523
+#: ../clients/common/nm-meta-setting-desc.c:7546
msgid "DCB settings"
msgstr "DCB 設定"
-#: ../clients/common/nm-meta-setting-desc.c:7524
+#: ../clients/common/nm-meta-setting-desc.c:7547
msgid "Dummy settings"
msgstr "ダミー設定"
-#: ../clients/common/nm-meta-setting-desc.c:7525
+#: ../clients/common/nm-meta-setting-desc.c:7548
msgid "Generic settings"
msgstr "汎用設定"
-#: ../clients/common/nm-meta-setting-desc.c:7526
+#: ../clients/common/nm-meta-setting-desc.c:7549
msgid "GSM mobile broadband connection"
msgstr "GSM モバイルブロードバンド接続"
-#: ../clients/common/nm-meta-setting-desc.c:7527
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../clients/common/nm-meta-setting-desc.c:7550
+#: ../src/devices/nm-device-infiniband.c:172
msgid "InfiniBand connection"
msgstr "InfiniBand 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7528
+#: ../clients/common/nm-meta-setting-desc.c:7551
msgid "IPv4 protocol"
msgstr "IPv4 プロトコル"
-#: ../clients/common/nm-meta-setting-desc.c:7529
+#: ../clients/common/nm-meta-setting-desc.c:7552
msgid "IPv6 protocol"
msgstr "IPv6 プロトコル"
-#: ../clients/common/nm-meta-setting-desc.c:7530
+#: ../clients/common/nm-meta-setting-desc.c:7553
msgid "IP-tunnel settings"
msgstr "IP トンネル設定"
-#: ../clients/common/nm-meta-setting-desc.c:7531
+#: ../clients/common/nm-meta-setting-desc.c:7554
msgid "MACsec connection"
msgstr "MACsec 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7532
+#: ../clients/common/nm-meta-setting-desc.c:7555
msgid "macvlan connection"
msgstr "macvlan 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7533
+#: ../clients/common/nm-meta-setting-desc.c:7556
msgid "OLPC Mesh connection"
msgstr "OLPC Mesh 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7534
+#: ../clients/common/nm-meta-setting-desc.c:7557
msgid "OpenVSwitch bridge settings"
msgstr "OpenVSwitch ブリッジ設定"
-#: ../clients/common/nm-meta-setting-desc.c:7535
+#: ../clients/common/nm-meta-setting-desc.c:7558
msgid "OpenVSwitch interface settings"
msgstr "OpenVSwitch インターフェース設定"
-#: ../clients/common/nm-meta-setting-desc.c:7536
+#: ../clients/common/nm-meta-setting-desc.c:7559
msgid "OpenVSwitch patch interface settings"
msgstr "OpenVSwitch パッチインターフェース設定"
-#: ../clients/common/nm-meta-setting-desc.c:7537
+#: ../clients/common/nm-meta-setting-desc.c:7560
msgid "OpenVSwitch port settings"
msgstr "OpenVSwitch ポート設定"
-#: ../clients/common/nm-meta-setting-desc.c:7538
+#: ../clients/common/nm-meta-setting-desc.c:7561
msgid "PPP settings"
msgstr "PPP 設定"
-#: ../clients/common/nm-meta-setting-desc.c:7539
+#: ../clients/common/nm-meta-setting-desc.c:7562
msgid "PPPoE"
msgstr "PPPoE"
-#: ../clients/common/nm-meta-setting-desc.c:7540
+#: ../clients/common/nm-meta-setting-desc.c:7563
msgid "Proxy"
msgstr "プロキシ"
-#: ../clients/common/nm-meta-setting-desc.c:7541
+#: ../clients/common/nm-meta-setting-desc.c:7564
msgid "Serial settings"
msgstr "シリアル設定"
-#: ../clients/common/nm-meta-setting-desc.c:7542
+#: ../clients/common/nm-meta-setting-desc.c:7565
msgid "Traffic controls"
-msgstr ""
+msgstr "トラフィックコントロール"
-#: ../clients/common/nm-meta-setting-desc.c:7543
+#: ../clients/common/nm-meta-setting-desc.c:7566
msgid "Team device"
msgstr "Team デバイス"
-#: ../clients/common/nm-meta-setting-desc.c:7544
+#: ../clients/common/nm-meta-setting-desc.c:7567
msgid "Team port"
msgstr "Team ポート"
-#: ../clients/common/nm-meta-setting-desc.c:7545
+#: ../clients/common/nm-meta-setting-desc.c:7568
msgid "Tun device"
msgstr "TUN デバイス"
-#: ../clients/common/nm-meta-setting-desc.c:7546
+#: ../clients/common/nm-meta-setting-desc.c:7569
msgid "User settings"
msgstr "ユーザー設定"
-#: ../clients/common/nm-meta-setting-desc.c:7547
-#: ../src/devices/nm-device-vlan.c:394
+#: ../clients/common/nm-meta-setting-desc.c:7570
+#: ../src/devices/nm-device-vlan.c:393
msgid "VLAN connection"
msgstr "VLAN 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
+#: ../clients/common/nm-meta-setting-desc.c:7571 ../src/nm-manager.c:4943
msgid "VPN connection"
msgstr "VPN 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7549
-#: ../src/devices/nm-device-vxlan.c:331
+#: ../clients/common/nm-meta-setting-desc.c:7572
+#: ../src/devices/nm-device-vxlan.c:327
msgid "VXLAN connection"
msgstr "VXLAN 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7550
+#: ../clients/common/nm-meta-setting-desc.c:7573
msgid "WiMAX connection"
msgstr "WiMAX 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7551
+#: ../clients/common/nm-meta-setting-desc.c:7574
msgid "Wired Ethernet"
msgstr "有線 Ethernet"
-#: ../clients/common/nm-meta-setting-desc.c:7552
+#: ../clients/common/nm-meta-setting-desc.c:7575
msgid "Wi-Fi connection"
msgstr "Wi-Fi 接続"
-#: ../clients/common/nm-meta-setting-desc.c:7553
+#: ../clients/common/nm-meta-setting-desc.c:7576
msgid "Wi-Fi security settings"
msgstr "Wi-Fi セキュリティー設定"
-#: ../clients/common/nm-meta-setting-desc.c:7870
+#: ../clients/common/nm-meta-setting-desc.c:7893
msgid "name"
msgstr "名前"
-#: ../clients/common/nm-polkit-listener.c:212
+#: ../clients/common/nm-polkit-listener.c:239
msgid "An authentication session is already underway."
msgstr "認証セッションはすでに実行されています。"
-#: ../clients/common/nm-secret-agent-simple.c:240
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:308
-#: ../clients/common/nm-secret-agent-simple.c:344
-#: ../clients/common/nm-secret-agent-simple.c:508
-#: ../clients/common/nm-secret-agent-simple.c:540
-#: ../clients/common/nm-secret-agent-simple.c:562
+#: ../clients/common/nm-secret-agent-simple.c:255
+#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/common/nm-secret-agent-simple.c:359
+#: ../clients/common/nm-secret-agent-simple.c:519
+#: ../clients/common/nm-secret-agent-simple.c:551
+#: ../clients/common/nm-secret-agent-simple.c:573
#: ../clients/common/nm-vpn-helpers.c:119
#: ../clients/common/nm-vpn-helpers.c:123
#: ../clients/common/nm-vpn-helpers.c:129
@@ -5789,29 +5807,29 @@ msgstr "認証セッションはすでに実行されています。"
msgid "Password"
msgstr "パスワード"
-#: ../clients/common/nm-secret-agent-simple.c:250
+#: ../clients/common/nm-secret-agent-simple.c:265
msgid "Identity"
msgstr "ID"
-#: ../clients/common/nm-secret-agent-simple.c:256
+#: ../clients/common/nm-secret-agent-simple.c:271
msgid "Private key password"
msgstr "プライベートキーのパスワード"
-#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:310
#: ../clients/tui/nmt-page-wifi.c:289
msgid "Key"
msgstr "キー"
-#: ../clients/common/nm-secret-agent-simple.c:338
+#: ../clients/common/nm-secret-agent-simple.c:353
#: ../clients/tui/nmt-page-dsl.c:78
msgid "Service"
msgstr "サービス"
-#: ../clients/common/nm-secret-agent-simple.c:469
+#: ../clients/common/nm-secret-agent-simple.c:484
msgid "Authentication required by wireless network"
msgstr "ワイヤレスネットワークで必要とされる認証"
-#: ../clients/common/nm-secret-agent-simple.c:470
+#: ../clients/common/nm-secret-agent-simple.c:485
#, c-format
msgid ""
"Passwords or encryption keys are required to access the wireless network "
@@ -5820,71 +5838,71 @@ msgstr ""
"ワイヤレスネットワーク '%s' へのアクセスには、パスワードまたは暗号キーが必要"
"です。"
-#: ../clients/common/nm-secret-agent-simple.c:478
+#: ../clients/common/nm-secret-agent-simple.c:489
msgid "Wired 802.1X authentication"
msgstr "有線 802.1X の認証"
-#: ../clients/common/nm-secret-agent-simple.c:479
+#: ../clients/common/nm-secret-agent-simple.c:490
#, c-format
msgid "Secrets are required to access the wired network '%s'"
msgstr "有線ネットワーク '%s' へのアクセスにはシークレットが必要です"
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:495
msgid "DSL authentication"
msgstr "DSL 認証"
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:496
#, c-format
msgid "Secrets are required for the DSL connection '%s'"
msgstr "DSL 接続 '%s' にはシークレットが必要です"
-#: ../clients/common/nm-secret-agent-simple.c:493
+#: ../clients/common/nm-secret-agent-simple.c:504
msgid "PIN code required"
msgstr "PIN コードが必要です"
-#: ../clients/common/nm-secret-agent-simple.c:494
+#: ../clients/common/nm-secret-agent-simple.c:505
msgid "PIN code is needed for the mobile broadband device"
msgstr "モバイルブロードバンドのデバイスには PIN コードが必要です"
-#: ../clients/common/nm-secret-agent-simple.c:497
+#: ../clients/common/nm-secret-agent-simple.c:508
msgid "PIN"
msgstr "PIN"
-#: ../clients/common/nm-secret-agent-simple.c:503
-#: ../clients/common/nm-secret-agent-simple.c:535
-#: ../clients/common/nm-secret-agent-simple.c:557
+#: ../clients/common/nm-secret-agent-simple.c:514
+#: ../clients/common/nm-secret-agent-simple.c:546
+#: ../clients/common/nm-secret-agent-simple.c:568
msgid "Mobile broadband network password"
msgstr "モバイルブロードバンドのネットワークパスワード"
-#: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:536
-#: ../clients/common/nm-secret-agent-simple.c:558
-#: ../clients/common/nm-secret-agent-simple.c:579
+#: ../clients/common/nm-secret-agent-simple.c:515
+#: ../clients/common/nm-secret-agent-simple.c:547
+#: ../clients/common/nm-secret-agent-simple.c:569
+#: ../clients/common/nm-secret-agent-simple.c:586
#, c-format
msgid "A password is required to connect to '%s'."
msgstr "'%s' への接続にはパスワードが必要です。"
-#: ../clients/common/nm-secret-agent-simple.c:517
+#: ../clients/common/nm-secret-agent-simple.c:528
#, c-format
msgid "Secrets are required to access the MACsec network '%s'"
msgstr "MACsec ネットワーク '%s' へのアクセスにはシークレットが必要です"
-#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:532
msgid "MACsec PSK authentication"
msgstr "MACsec PSK 認証"
-#: ../clients/common/nm-secret-agent-simple.c:529
+#: ../clients/common/nm-secret-agent-simple.c:540
msgid "MACsec EAP authentication"
msgstr "MACsec EAP 認証"
-#: ../clients/common/nm-secret-agent-simple.c:574
+#: ../clients/common/nm-secret-agent-simple.c:581
msgid "VPN password required"
msgstr "VPN パスワードが必要です"
#: ../clients/common/nm-vpn-helpers.c:48
#, c-format
msgid "unknown VPN plugin \"%s\""
-msgstr "不明な VPNプラグイン '%s'"
+msgstr "不明な VPN プラグイン '%s'"
#: ../clients/common/nm-vpn-helpers.c:59
#, c-format
@@ -5931,11 +5949,11 @@ msgid "Gateway certificate hash"
msgstr "ゲートウェイ証明書ハッシュ"
#. Generated file. Do not edit.
-#: ../clients/common/settings-docs.c.in:3
+#: ../clients/common/settings-docs.h.in:3
msgid "Channel on which the mesh network to join is located."
msgstr "参加するメッシュネットワークが存在するチャンネル。"
-#: ../clients/common/settings-docs.c.in:4
+#: ../clients/common/settings-docs.h.in:4
msgid ""
"Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
"specific anycast address used determines which DHCP server class answers the "
@@ -5945,45 +5963,45 @@ msgstr ""
"す。使用されたエニーキャストアドレスは、リクエストに応答する DHCP サーバーク"
"ラスを判別します。"
-#: ../clients/common/settings-docs.c.in:5
-#: ../clients/common/settings-docs.c.in:18
-#: ../clients/common/settings-docs.c.in:30
-#: ../clients/common/settings-docs.c.in:57
-#: ../clients/common/settings-docs.c.in:96
-#: ../clients/common/settings-docs.c.in:105
-#: ../clients/common/settings-docs.c.in:113
-#: ../clients/common/settings-docs.c.in:115
-#: ../clients/common/settings-docs.c.in:124
-#: ../clients/common/settings-docs.c.in:128
-#: ../clients/common/settings-docs.c.in:132
-#: ../clients/common/settings-docs.c.in:148
-#: ../clients/common/settings-docs.c.in:165
-#: ../clients/common/settings-docs.c.in:174
-#: ../clients/common/settings-docs.c.in:175
-#: ../clients/common/settings-docs.c.in:180
-#: ../clients/common/settings-docs.c.in:192
-#: ../clients/common/settings-docs.c.in:202
-#: ../clients/common/settings-docs.c.in:225
-#: ../clients/common/settings-docs.c.in:246
-#: ../clients/common/settings-docs.c.in:257
-#: ../clients/common/settings-docs.c.in:262
-#: ../clients/common/settings-docs.c.in:268
-#: ../clients/common/settings-docs.c.in:271
-#: ../clients/common/settings-docs.c.in:273
-#: ../clients/common/settings-docs.c.in:279
-#: ../clients/common/settings-docs.c.in:289
-#: ../clients/common/settings-docs.c.in:301
-#: ../clients/common/settings-docs.c.in:309
-#: ../clients/common/settings-docs.c.in:314
-#: ../clients/common/settings-docs.c.in:318
-#: ../clients/common/settings-docs.c.in:325
-#: ../clients/common/settings-docs.c.in:342
-#: ../clients/common/settings-docs.c.in:349
-#: ../clients/common/settings-docs.c.in:354
-#: ../clients/common/settings-docs.c.in:359
-#: ../clients/common/settings-docs.c.in:362
-#: ../clients/common/settings-docs.c.in:376
-#: ../clients/common/settings-docs.c.in:386
+#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:392
msgid ""
"The setting's name, which uniquely identifies the setting within the "
"connection. Each setting type has a name unique to that type, for example "
@@ -5992,11 +6010,11 @@ msgstr ""
"設定の名前。接続の設定を一意に識別します。設定タイプには、そのタイプに一意の"
"名前 (\"ppp\"、\"wireless\"、\"wired\" など) がそれぞれ設定されます。"
-#: ../clients/common/settings-docs.c.in:6
+#: ../clients/common/settings-docs.h.in:6
msgid "SSID of the mesh network to join."
msgstr "参加するメッシュネットワークの SSID。"
-#: ../clients/common/settings-docs.c.in:7
+#: ../clients/common/settings-docs.h.in:7
msgid ""
"802.11 frequency band of the network. One of \"a\" for 5GHz 802.11a or \"bg"
"\" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network to "
@@ -6012,7 +6030,7 @@ msgstr ""
"関連付けを行いません。この設定は、特定のドライバー機能に依存し、すべてのドラ"
"イバーで利用できるわけではありません。"
-#: ../clients/common/settings-docs.c.in:8
+#: ../clients/common/settings-docs.h.in:8
msgid ""
"If specified, directs the device to only associate with the given access "
"point. This capability is highly driver dependent and not supported by all "
@@ -6024,7 +6042,7 @@ msgstr ""
"ません。注記: このプロパティーは、Ad-Hoc ネットワークの作成時に使用される "
"BSSID を制御せず、今後もおそらく制御されません。"
-#: ../clients/common/settings-docs.c.in:9
+#: ../clients/common/settings-docs.h.in:9
msgid ""
"Wireless channel to use for the Wi-Fi connection. The device will only join "
"(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel. "
@@ -6036,21 +6054,20 @@ msgstr ""
"ネル数はバンド間で重複するため、このプロパティーとともに \"band\" プロパ"
"ティーを設定する必要があります。"
-#: ../clients/common/settings-docs.c.in:10
-#, fuzzy
-msgid ""
-"If specified, request that the device use this MAC address instead. This is "
-"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-"address, the special values \"preserve\", \"permanent\", \"random\" and "
-"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-"activation. \"permanent\" means to use the permanent hardware address of the "
-"device. \"random\" creates a random MAC address on each connect. \"stable\" "
-"creates a hashed MAC address based on connection.stable-id and a machine "
-"dependent key. If unspecified, the value can be overwritten via global "
-"defaults, see manual of NetworkManager.conf. If still unspecified, it "
-"defaults to \"preserve\" (older versions of NetworkManager may use a "
-"different default value). On D-Bus, this field is expressed as \"assigned-"
-"mac-address\" or the deprecated \"cloned-mac-address\"."
+#: ../clients/common/settings-docs.h.in:10
+msgid ""
+"If specified, request that the device use this MAC address instead of its "
+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
+"explicitly specifying a MAC address, the special values \"preserve\", "
+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
+"not to touch the MAC address on activation. \"permanent\" means to use the "
+"permanent hardware address of the device. \"random\" creates a random MAC "
+"address on each connect. \"stable\" creates a hashed MAC address based on "
+"connection.stable-id and a machine dependent key. If unspecified, the value "
+"can be overwritten via global defaults, see manual of NetworkManager.conf. "
+"If still unspecified, it defaults to \"permanent\". On D-Bus, this field is "
+"expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address"
+"\"."
msgstr ""
"これを指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC "
"アドレスを使用する必要があります。これは、MAC クローニングまたはスプーフィン"
@@ -6065,8 +6082,8 @@ msgstr ""
"\" が設定されます。D-Bus において、このフィールドは \"assigned-mac-address\" "
"または廃止予定の \"cloned-mac-address\" として表示されます。"
-#: ../clients/common/settings-docs.c.in:11
-#: ../clients/common/settings-docs.c.in:92
+#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.h.in:94
msgid ""
"With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
"bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6115,21 +6132,26 @@ msgstr ""
"化された MAC アドレスを作成し、ランダムでローカルまたはグローバルで管理されま"
"す。"
-#: ../clients/common/settings-docs.c.in:12
+#: ../clients/common/settings-docs.h.in:12
msgid ""
"If TRUE, indicates this network is a non-broadcasting network that hides its "
"SSID. In this case various workarounds may take place, such as probe-"
"scanning the SSID for more reliable network discovery. However, these "
"workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution."
+"hidden SSID networks should be used with caution. Note that marking the "
+"network as hidden may be a privacy issue for you, as the explicit probe-"
+"scans may be distinctly recognizable on the air."
msgstr ""
"TRUE の場合、このネットワークは、その SSID を非表示にする非ブロードキャストの"
"ネットワークであることを示しています。この場合は、信頼性がより高いネットワー"
"ク検出の SSID をプローブスキャンするなど、様々な回避策を選択できます。ただ"
-"し、非表示の SSID ネットワークを使用して、継承された不安定を公開するため、非"
-"公開の SSID ネットワークは注意して使用する必要があります。"
+"し、これらの回避策は、非表示の SSID ネットワークを使用して継承された不安定を"
+"公開するため、非表示の SSID ネットワークを使用する際は注意が必要です。明示的"
+"なプローブスキャンは、ブロードキャストの際にはっきりと認識できる可能性がある"
+"ため、ネットワークを非表示にマーキングすることは、プライバシーの問題になり得"
+"ることに注意してください。"
-#: ../clients/common/settings-docs.c.in:13
+#: ../clients/common/settings-docs.h.in:13
msgid ""
"If specified, this connection will only apply to the Wi-Fi device whose "
"permanent MAC address matches. This property does not change the MAC address "
@@ -6139,7 +6161,7 @@ msgstr ""
"用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC ス"
"プーフィング)。"
-#: ../clients/common/settings-docs.c.in:14
+#: ../clients/common/settings-docs.h.in:14
msgid ""
"A list of permanent MAC addresses of Wi-Fi devices to which this connection "
"should never apply. Each MAC address should be given in the standard hex-"
@@ -6149,7 +6171,7 @@ msgstr ""
"MAC アドレスは、標準の 16 進数とコロン (\"00:11:22:33:44:55\" など) で指定す"
"る必要があります。"
-#: ../clients/common/settings-docs.c.in:15
+#: ../clients/common/settings-docs.h.in:15
msgid ""
"One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
"user has set a global default to randomize and the supplicant supports "
@@ -6165,7 +6187,7 @@ msgstr ""
"(2) (MAC アドレスは常にランダム化されます) のいずれか。このプロパティーは "
"'cloned-mac-address' で非推奨になります。非推奨: 1"
-#: ../clients/common/settings-docs.c.in:16
+#: ../clients/common/settings-docs.h.in:16
msgid ""
"Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\". If "
"blank, infrastructure is assumed."
@@ -6173,8 +6195,8 @@ msgstr ""
"Wi-Fi ネットワークモード; \"infrastructure\"、\"adhoc\"、または \"ap\" のいず"
"れか。空白にすると、インフラストラクチャーは推測されます。"
-#: ../clients/common/settings-docs.c.in:17
-#: ../clients/common/settings-docs.c.in:95
+#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.h.in:97
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple Ethernet frames."
@@ -6182,7 +6204,7 @@ msgstr ""
"ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きなパ"
"ケットは、複数の Ethernet フレームに分割されます。"
-#: ../clients/common/settings-docs.c.in:19
+#: ../clients/common/settings-docs.h.in:19
msgid ""
"One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
"saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6196,7 +6218,7 @@ msgstr ""
"い)、または NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (グローバルで設定した値"
"を使用) のいずれか。その他のすべての値は予約されます。"
-#: ../clients/common/settings-docs.c.in:20
+#: ../clients/common/settings-docs.h.in:20
msgid ""
"If non-zero, directs the device to only use the specified bitrate for "
"communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/"
@@ -6208,7 +6230,7 @@ msgstr ""
"このプロパティーは、ドライバーに高く依存し、静的なビットレートの設定をすべて"
"のデバイスがサポートするわけではありません。"
-#: ../clients/common/settings-docs.c.in:21
+#: ../clients/common/settings-docs.h.in:21
msgid ""
"A list of BSSIDs (each BSSID formatted as a MAC address like "
"\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6222,11 +6244,11 @@ msgstr ""
"NetworkManager の BSSID 一覧を反映します。この変更により、プロパティーは保存"
"されなくなります。"
-#: ../clients/common/settings-docs.c.in:22
+#: ../clients/common/settings-docs.h.in:22
msgid "SSID of the Wi-Fi network. Must be specified."
msgstr "Wi-Fi の SSID。指定する必要があります。"
-#: ../clients/common/settings-docs.c.in:23
+#: ../clients/common/settings-docs.h.in:23
msgid ""
"If non-zero, directs the device to use the specified transmit power. Units "
"are dBm. This property is highly driver dependent and not all devices "
@@ -6236,7 +6258,36 @@ msgstr ""
"です。このプロパティーは、ドライバーに大きく依存しており、すべてのデバイスが"
"静的送信電力をサポートしているとは限りません。"
-#: ../clients/common/settings-docs.c.in:24
+#: ../clients/common/settings-docs.h.in:24
+msgid ""
+"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
+"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
+"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
+"Wake-on-LAN in NetworkManager)."
+msgstr ""
+"有効にする NMSettingWirelessWakeOnWLan オプション。すべてのデバイスがすべての"
+"オプションをサポートするわけではありません。\n"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) または特別な値 "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (グローバル設定を使用) および "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (NetworkManager で Wake-on-"
+"LAN の管理を無効) から組み合わせることができます。"
+
+#: ../clients/common/settings-docs.h.in:25
msgid ""
"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
"802.11 authentication algorithm required by the AP here. One of \"open\" "
@@ -6251,7 +6302,28 @@ msgstr ""
"auth-alg = \"leap\") を使用している場合は、\"leap-username\" プロパティーと "
"\"leap-password\" プロパティーを指定する必要があります。"
-#: ../clients/common/settings-docs.c.in:25
+#: ../clients/common/settings-docs.h.in:26
+msgid ""
+"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
+"connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
+"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
+"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
+"if the supplicant and the access point support it) or "
+"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
+"supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
+"no global default is set, FILS will be optionally enabled."
+msgstr ""
+"接続用にファーストイニシャルリンク設定 (802.11ai) を有効にする必要があるかど"
+"うかを示します。 NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (グローバルの"
+"デフォルト値を使用する)、NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (FILS"
+"を無効にする)、NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (サプリカントお"
+"よびアクセスポイントがサポートしている場合は FILS を有効にする) または "
+"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (FILS を有効にし、サポートされ"
+"ていない場合は失敗する) のいずれかを有効にします。 "
+"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) を設定し、グローバルデフォルト"
+"が設定されていない場合は、FILS が任意で有効になります。"
+
+#: ../clients/common/settings-docs.h.in:27
msgid ""
"A list of group/broadcast encryption algorithms which prevents connections "
"to Wi-Fi networks that do not utilize one of the algorithms in the list. "
@@ -6264,7 +6336,7 @@ msgstr ""
"\"wep40\"、\"wep104\"、\"tkip\"、または \"ccmp\" のいずれかにすることができま"
"す。"
-#: ../clients/common/settings-docs.c.in:26
+#: ../clients/common/settings-docs.h.in:28
msgid ""
"Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
"\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
@@ -6276,7 +6348,7 @@ msgstr ""
"は \"wpa-eap\" (WPA-Enterprise) のいずれかになります。このプロパティーは、セ"
"キュリティーを使用するすべての Wi-Fi 接続に設定する必要があります。"
-#: ../clients/common/settings-docs.c.in:27
+#: ../clients/common/settings-docs.h.in:29
msgid ""
"The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
"and auth-alg = \"leap\")."
@@ -6284,11 +6356,11 @@ msgstr ""
"レガシー LEAP 接続のログインパスワード (key-mgmt = \"ieee8021x\" および auth-"
"alg = \"leap\")。"
-#: ../clients/common/settings-docs.c.in:28
+#: ../clients/common/settings-docs.h.in:30
msgid "Flags indicating how to handle the \"leap-password\" property."
msgstr "\"leap-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:29
+#: ../clients/common/settings-docs.h.in:31
msgid ""
"The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
"and auth-alg = \"leap\")."
@@ -6296,7 +6368,7 @@ msgstr ""
"レガシー LEAP 接続のログインユーザー名 (key-mgmt = \"ieee8021x\" および auth-"
"alg = \"leap\")。"
-#: ../clients/common/settings-docs.c.in:31
+#: ../clients/common/settings-docs.h.in:33
msgid ""
"A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
"networks that do not utilize one of the algorithms in the list. For maximum "
@@ -6308,7 +6380,7 @@ msgstr ""
"ロパティーを空にします。リストエレメントはそれぞれ \"tkip\" または \"ccmp\" "
"にできます。"
-#: ../clients/common/settings-docs.c.in:32
+#: ../clients/common/settings-docs.h.in:34
msgid ""
"Indicates whether Protected Management Frames (802.11w) must be enabled for "
"the connection. One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6329,7 +6401,7 @@ msgstr ""
"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) を設定し、グローバルデフォルトが"
"設定されていない場合は、PMF が任意で有効になります。"
-#: ../clients/common/settings-docs.c.in:33
+#: ../clients/common/settings-docs.h.in:35
msgid ""
"List of strings specifying the allowed WPA protocol versions to use. Each "
"element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN). If not "
@@ -6339,7 +6411,7 @@ msgstr ""
"\" (WPA を許可) または \"rsn\" (WPA2/RSN を許可) になります。指定していない"
"と、WPA 接続と RSN 接続の両方が許可されます。"
-#: ../clients/common/settings-docs.c.in:34
+#: ../clients/common/settings-docs.h.in:36
msgid ""
"Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must "
"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6355,11 +6427,11 @@ msgstr ""
"ワークに接続する際に使用される実際の WPA-PSK を取得するためにハッシュ化されま"
"す。"
-#: ../clients/common/settings-docs.c.in:35
+#: ../clients/common/settings-docs.h.in:37
msgid "Flags indicating how to handle the \"psk\" property."
msgstr "\"psk\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:36
+#: ../clients/common/settings-docs.h.in:38
msgid ""
"Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
"and \"wep-key3\" properties."
@@ -6367,7 +6439,7 @@ msgstr ""
"プロパティー \"wep-key0\"、\"wep-key1\"、\"wep-key2\"、および \"wep-key3\" の"
"処理方法を示すフラグ"
-#: ../clients/common/settings-docs.c.in:37
+#: ../clients/common/settings-docs.h.in:39
msgid ""
"Controls the interpretation of WEP keys. Allowed values are "
"NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6382,7 +6454,7 @@ msgstr ""
"きますが、この場合は、パスフレーズを文字列として提供し、実際に WEP キーを取得"
"する MD5 メソッドを使用してハッシュ化されます。"
-#: ../clients/common/settings-docs.c.in:38
+#: ../clients/common/settings-docs.h.in:40
msgid ""
"Index 0 WEP key. This is the WEP key used in most networks. See the \"wep-"
"key-type\" property for a description of how this key is interpreted."
@@ -6390,7 +6462,7 @@ msgstr ""
"インデックス 0 の WEP キー。この WEP キーは、多くネットワークで使用されていま"
"す。キーの解釈方法は、\"wep-key-type\" プロパティーを参照してください。"
-#: ../clients/common/settings-docs.c.in:39
+#: ../clients/common/settings-docs.h.in:41
msgid ""
"Index 1 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6399,7 +6471,7 @@ msgstr ""
"されていません。キーの解釈方法は、\"wep-key-type\" プロパティーを参照してくだ"
"さい。"
-#: ../clients/common/settings-docs.c.in:40
+#: ../clients/common/settings-docs.h.in:42
msgid ""
"Index 2 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6408,7 +6480,7 @@ msgstr ""
"されていません。キーの解釈方法は、\"wep-key-type\" プロパティーを参照してくだ"
"さい。"
-#: ../clients/common/settings-docs.c.in:41
+#: ../clients/common/settings-docs.h.in:43
msgid ""
"Index 3 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6417,7 +6489,7 @@ msgstr ""
"されていません。キーの解釈方法は、\"wep-key-type\" プロパティーを参照してくだ"
"さい。"
-#: ../clients/common/settings-docs.c.in:42
+#: ../clients/common/settings-docs.h.in:44
msgid ""
"When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
"index is used by the AP, put that WEP key index here. Valid values are 0 "
@@ -6429,7 +6501,7 @@ msgstr ""
"ます。有効な値は 0 (デフォルトキー) から 3 です。コンシューマーのアクセスポイ"
"ント (Linksys WRT54G など) のキー番号は 1 - 4 となります。"
-#: ../clients/common/settings-docs.c.in:43
+#: ../clients/common/settings-docs.h.in:45
msgid ""
"Flags indicating which mode of WPS is to be used if any. There's little "
"point in changing the default setting as NetworkManager will automatically "
@@ -6442,7 +6514,7 @@ msgstr ""
"NetworkManager が自動的に決定するため、デフォルト設定の変更をする利点はほと"
"んどありません。このプロパティーの値を 1 にすると WPS を無効にできます。"
-#: ../clients/common/settings-docs.c.in:44
+#: ../clients/common/settings-docs.h.in:46
msgid ""
"List of strings to be matched against the altSubjectName of the certificate "
"presented by the authentication server. If the list is empty, no "
@@ -6451,7 +6523,7 @@ msgstr ""
"認証サーバーで表示される証明書の altSubjectName に一致する文字列の一覧。この"
"一覧が空の場合は、サーバー証明書の altSubjectName が検証されません。"
-#: ../clients/common/settings-docs.c.in:45
+#: ../clients/common/settings-docs.h.in:47
msgid ""
"Anonymous identity string for EAP authentication methods. Used as the "
"unencrypted identity with EAP types that support different tunneled identity "
@@ -6461,7 +6533,7 @@ msgstr ""
"イデンティティをサポートする EAP タイプで、暗号化していないアイデンティティと"
"して使用しました。"
-#: ../clients/common/settings-docs.c.in:46
+#: ../clients/common/settings-docs.h.in:48
msgid ""
"A timeout for the authentication. Zero means the global default; if the "
"global default is not set, the authentication timeout is 25 seconds."
@@ -6469,7 +6541,7 @@ msgstr ""
"認証のタイムアウト。ゼロはグローバルのデフォルトになります。グローバルデフォ"
"ルトを設定しないと、認証のタイムアウトは 25 秒になります。"
-#: ../clients/common/settings-docs.c.in:47
+#: ../clients/common/settings-docs.h.in:49
msgid ""
"Contains the CA certificate if used by the EAP method specified in the \"eap"
"\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6486,12 +6558,12 @@ msgstr ""
"2 つがサポートされます。(NM 0.7.x との後方互換性である) ブロブスキームを使用"
"する場合は、このプロパティーを、証明書の DER エンコードデータに設定する必要が"
"あります。パススキームを使用する場合は、このプロパティーを、文字列 \"file://"
-"\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指定する証"
-"明書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書を"
-"サポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能"
-"になるため、推奨されません。"
+"\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフルパスで指定する証明"
+"書に設定する必要があります。このプロパティーは、EAP メソッドが CA 証明書をサ"
+"ポートする場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能に"
+"なるため、推奨されません。"
-#: ../clients/common/settings-docs.c.in:48
+#: ../clients/common/settings-docs.h.in:50
msgid ""
"The password used to access the CA certificate stored in \"ca-cert\" "
"property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6501,11 +6573,11 @@ msgstr ""
"スワード。証明書が、ログインを要求する PKCS#11 トークンに保存された場合にのみ"
"適用されます。"
-#: ../clients/common/settings-docs.c.in:49
+#: ../clients/common/settings-docs.h.in:51
msgid "Flags indicating how to handle the \"ca-cert-password\" property."
msgstr "\"ca-cert-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:50
+#: ../clients/common/settings-docs.h.in:52
msgid ""
"UTF-8 encoded path to a directory containing PEM or DER formatted "
"certificates to be added to the verification chain in addition to the "
@@ -6515,7 +6587,7 @@ msgstr ""
"される PEM フォーマットまたは DER フォーマットの証明書を含むディレクトリーへ"
"の UTF-8 エンコードパス。"
-#: ../clients/common/settings-docs.c.in:51
+#: ../clients/common/settings-docs.h.in:53
msgid ""
"Contains the client certificate if used by the EAP method specified in the "
"\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6533,7 +6605,7 @@ msgstr ""
"\"file://\" で始まり、終了 NUL バイトで終わる UTF-8 エンコードのフル パスで指"
"定する証明書に設定する必要があります。"
-#: ../clients/common/settings-docs.c.in:52
+#: ../clients/common/settings-docs.h.in:54
msgid ""
"The password used to access the client certificate stored in \"client-cert\" "
"property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6543,11 +6615,11 @@ msgstr ""
"に使用されるパスワード。証明書が、ログインを要求する PKCS#11 トークンに保存さ"
"れた場合にのみ適用されます。"
-#: ../clients/common/settings-docs.c.in:53
+#: ../clients/common/settings-docs.h.in:55
msgid "Flags indicating how to handle the \"client-cert-password\" property."
msgstr "\"client-cert-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:54
+#: ../clients/common/settings-docs.h.in:56
msgid ""
"Constraint for server domain name. If set, this FQDN is used as a suffix "
"match requirement for dNSName element(s) of the certificate presented by the "
@@ -6560,7 +6632,7 @@ msgstr ""
"る dNSName が見つかると、この制約が満たされます。dNSName 値が表示されないと、"
"この制約は、同じサフィックス一致比較を使用して SubjectName CN を照合します。"
-#: ../clients/common/settings-docs.c.in:55
+#: ../clients/common/settings-docs.h.in:57
msgid ""
"The allowed EAP method to be used when authenticating to the network with "
"802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6574,7 +6646,7 @@ msgstr ""
"になります。可能な組み合わせについては、wpa_supplicant ドキュメントを参照して"
"ください。"
-#: ../clients/common/settings-docs.c.in:56
+#: ../clients/common/settings-docs.h.in:58
msgid ""
"Identity string for EAP authentication methods. Often the user's user or "
"login name."
@@ -6582,11 +6654,11 @@ msgstr ""
"EAP 認証方法のアイデンティティ文字列。しばしば、ユーザーのユーザー名またはロ"
"グイン名になります。"
-#: ../clients/common/settings-docs.c.in:58
+#: ../clients/common/settings-docs.h.in:60
msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
msgstr "EAP-FAST の PAC を含む UTF-8 エンコーディングファイルパス。"
-#: ../clients/common/settings-docs.c.in:59
+#: ../clients/common/settings-docs.h.in:61
msgid ""
"UTF-8 encoded password used for EAP authentication methods. If both the "
"\"password\" property and the \"password-raw\" property are specified, "
@@ -6596,15 +6668,15 @@ msgstr ""
"ティーと \"password-raw\" プロパティーの両方を指定すると、\"password\" が優先"
"されます。"
-#: ../clients/common/settings-docs.c.in:60
-#: ../clients/common/settings-docs.c.in:107
-#: ../clients/common/settings-docs.c.in:135
-#: ../clients/common/settings-docs.c.in:184
-#: ../clients/common/settings-docs.c.in:304
+#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:310
msgid "Flags indicating how to handle the \"password\" property."
msgstr "\"password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:61
+#: ../clients/common/settings-docs.h.in:63
msgid ""
"Password used for EAP authentication methods, given as a byte array to allow "
"passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -6616,11 +6688,11 @@ msgstr ""
"\"password-raw\" プロパティーの両方を指定すると、\"password\" が優先されま"
"す。"
-#: ../clients/common/settings-docs.c.in:62
+#: ../clients/common/settings-docs.h.in:64
msgid "Flags indicating how to handle the \"password-raw\" property."
msgstr "\"password-raw\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:63
+#: ../clients/common/settings-docs.h.in:65
msgid ""
"Specifies authentication flags to use in \"phase 1\" outer authentication "
"using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6635,7 +6707,7 @@ msgstr ""
"TLS オプションは tls_disable_tlsv1_x 設定にマッピングされます。詳細は、"
"wpa_supplicant ドキュメントを参照してください。"
-#: ../clients/common/settings-docs.c.in:64
+#: ../clients/common/settings-docs.h.in:66
msgid ""
"Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
"is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6651,7 +6723,7 @@ msgstr ""
"ジョニングを許可) となります。詳細は、wpa_supplicant ドキュメントを参照してく"
"ださい。"
-#: ../clients/common/settings-docs.c.in:65
+#: ../clients/common/settings-docs.h.in:67
msgid ""
"Forces use of the new PEAP label during key derivation. Some RADIUS servers "
"may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
@@ -6663,7 +6735,7 @@ msgstr ""
"ます。\"1\" に設定すると、新しい PEAP ラベルを使用することを強制します。詳細"
"は、wpa_supplicant ドキュメントを参照してください。"
-#: ../clients/common/settings-docs.c.in:66
+#: ../clients/common/settings-docs.h.in:68
msgid ""
"Forces which PEAP version is used when PEAP is set as the EAP method in the "
"\"eap\" property. When unset, the version reported by the server will be "
@@ -6677,7 +6749,7 @@ msgstr ""
"PEAP バージョンを使用するように強制する必要があります。そのためには、このプロ"
"パティーを \"0\" または \"1\" に設定して、その PEAP バージョンを強制します。"
-#: ../clients/common/settings-docs.c.in:67
+#: ../clients/common/settings-docs.h.in:69
msgid ""
"List of strings to be matched against the altSubjectName of the certificate "
"presented by the authentication server during the inner \"phase 2\" "
@@ -6688,7 +6760,7 @@ msgstr ""
"一致した文字列の一覧。この一覧が空の場合は、サーバー証明書の altSubjectName "
"が検証されません。"
-#: ../clients/common/settings-docs.c.in:68
+#: ../clients/common/settings-docs.h.in:70
msgid ""
"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6704,7 +6776,7 @@ msgstr ""
"させるには、各 \"phase 2\" の内部メソッドに特別なパラメーターが必要です。詳細"
"は wpa_supplicant ドキュメントを参照してください。"
-#: ../clients/common/settings-docs.c.in:69
+#: ../clients/common/settings-docs.h.in:71
msgid ""
"Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
"when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6713,14 +6785,14 @@ msgid ""
"requires specific parameters for successful authentication; see the "
"wpa_supplicant documentation for more details."
msgstr ""
-"内部 TLS トンネルを使用する EAP メソッドを \"eap\" プロパティに指定した場合"
-"は、利用可能な \"phase 2\" 内の非 EAP 認証方法を指定します。一般的に広められ"
-"ている EAP ベースの \"phase 2\"方法は、\"md5\"、\"mschapv2\"、\"otp\"、\"gtc"
+"内部 TLS トンネルを使用する EAP メソッドを \"eap\" プロパティーに指定した場合"
+"は、利用可能な \"phase 2\" 内の EAP 認証方法を指定します。一般的に広められて"
+"いる EAP ベースの \"phase 2\" 方法は、\"md5\"、\"mschapv2\"、\"otp\"、\"gtc"
"\"、および \"tls\" です。認証を成功させるには、\"phase 2\" 内の各方法に特別な"
"パラメーターが必要です。詳細は wpa_supplicant ドキュメントを参照してくださ"
"い。"
-#: ../clients/common/settings-docs.c.in:70
+#: ../clients/common/settings-docs.h.in:72
msgid ""
"Contains the \"phase 2\" CA certificate if used by the EAP method specified "
"in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6744,7 +6816,7 @@ msgstr ""
"でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるため、推奨"
"されません。"
-#: ../clients/common/settings-docs.c.in:71
+#: ../clients/common/settings-docs.h.in:73
msgid ""
"The password used to access the \"phase2\" CA certificate stored in \"phase2-"
"ca-cert\" property. Only makes sense if the certificate is stored on a "
@@ -6754,12 +6826,12 @@ msgstr ""
"セスするのに使用されるパスワード。この証明書が、ログが必要な PKCS#11 トークン"
"に保存されている場合に適用されます。"
-#: ../clients/common/settings-docs.c.in:72
+#: ../clients/common/settings-docs.h.in:74
msgid ""
"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
msgstr "\"phase2-ca-cert-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:73
+#: ../clients/common/settings-docs.h.in:75
msgid ""
"UTF-8 encoded path to a directory containing PEM or DER formatted "
"certificates to be added to the verification chain in addition to the "
@@ -6769,7 +6841,7 @@ msgstr ""
"追加された PEM フォーマットまたは DER フォーマットの証明書が保存されている"
"ディレクトリーへの UTF-8 エンコードのパス。"
-#: ../clients/common/settings-docs.c.in:74
+#: ../clients/common/settings-docs.h.in:76
msgid ""
"Contains the \"phase 2\" client certificate if used by the EAP method "
"specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6793,7 +6865,7 @@ msgstr ""
"する場合でも設定する必要はありませんが、設定しないと中間者攻撃が可能になるた"
"め、推奨されません。"
-#: ../clients/common/settings-docs.c.in:75
+#: ../clients/common/settings-docs.h.in:77
msgid ""
"The password used to access the \"phase2\" client certificate stored in "
"\"phase2-client-cert\" property. Only makes sense if the certificate is "
@@ -6803,12 +6875,12 @@ msgstr ""
"明書にアクセスするのに使用されるパスワード。この証明書が、ログインが必要な "
"PKCS#11 トークンに保存されている場合にのみ適用されます。"
-#: ../clients/common/settings-docs.c.in:76
+#: ../clients/common/settings-docs.h.in:78
msgid ""
"Flags indicating how to handle the \"phase2-client-cert-password\" property."
msgstr "\"phase2-client-cert-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:77
+#: ../clients/common/settings-docs.h.in:79
msgid ""
"Constraint for server domain name. If set, this FQDN is used as a suffix "
"match requirement for dNSName element(s) of the certificate presented by the "
@@ -6823,7 +6895,7 @@ msgstr ""
"dNSName 値が表示されないと、この制約は、同じサフィックス一致比較を使用して "
"SubjectName CN を照合します。"
-#: ../clients/common/settings-docs.c.in:78
+#: ../clients/common/settings-docs.h.in:80
msgid ""
"Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
"\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -6857,7 +6929,7 @@ msgstr ""
"は、\"phase2-private-key-password\" プロパティーを、PKCS#12 秘密鍵および証明"
"書を復号するパスワードに設定する必要があるためです。"
-#: ../clients/common/settings-docs.c.in:79
+#: ../clients/common/settings-docs.h.in:81
msgid ""
"The password used to decrypt the \"phase 2\" private key specified in the "
"\"phase2-private-key\" property when the private key either uses the path "
@@ -6867,12 +6939,12 @@ msgstr ""
"に、\"phase2-private-key\" プロパティーに指定した \"phase 2\" 秘密鍵の複号に"
"使用されるパスワード。"
-#: ../clients/common/settings-docs.c.in:80
+#: ../clients/common/settings-docs.h.in:82
msgid ""
"Flags indicating how to handle the \"phase2-private-key-password\" property."
msgstr "\"phase2-private-key-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:81
+#: ../clients/common/settings-docs.h.in:83
msgid ""
"Substring to be matched against the subject of the certificate presented by "
"the authentication server during the inner \"phase 2\" authentication. When "
@@ -6886,16 +6958,16 @@ msgstr ""
"は推奨されず、代わりに NMSetting8021x:phase2-domain-suffix-match が使用されま"
"す。"
-#: ../clients/common/settings-docs.c.in:82
+#: ../clients/common/settings-docs.h.in:84
msgid "PIN used for EAP authentication methods."
msgstr "EAP 認証方法に使用される PIN"
-#: ../clients/common/settings-docs.c.in:83
-#: ../clients/common/settings-docs.c.in:186
+#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:189
msgid "Flags indicating how to handle the \"pin\" property."
msgstr "\"pin\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:84
+#: ../clients/common/settings-docs.h.in:86
msgid ""
"Contains the private key when the \"eap\" property is set to \"tls\". Key "
"data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -6935,7 +7007,7 @@ msgstr ""
"鍵は常に秘密鍵パスワードで暗号化し、暗号化されていない秘密鍵データに非認証ア"
"クセスが行われないようにする必要があります。"
-#: ../clients/common/settings-docs.c.in:85
+#: ../clients/common/settings-docs.h.in:87
msgid ""
"The password used to decrypt the private key specified in the \"private-key"
"\" property when the private key either uses the path scheme, or if the "
@@ -6945,11 +7017,11 @@ msgstr ""
"場合に、\"private-key\" プロパティーに指定した秘密鍵の復号化に使用されるパス"
"ワード。"
-#: ../clients/common/settings-docs.c.in:86
+#: ../clients/common/settings-docs.h.in:88
msgid "Flags indicating how to handle the \"private-key-password\" property."
msgstr "\"private-key-password\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:87
+#: ../clients/common/settings-docs.h.in:89
msgid ""
"Substring to be matched against the subject of the certificate presented by "
"the authentication server. When unset, no verification of the authentication "
@@ -6962,7 +7034,7 @@ msgstr ""
"リティーがほぼ保護されないため、その使用は非推奨になり、代わりに "
"NMSetting8021x:domain-suffix-match が使用されます。"
-#: ../clients/common/settings-docs.c.in:88
+#: ../clients/common/settings-docs.h.in:90
msgid ""
"When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
"the system CA directory specified at configure time with the --system-ca-"
@@ -6982,32 +7054,38 @@ msgstr ""
"ティーが代わりに上書きされます (wpa_supplicant に ca_cert オプションおよび "
"ca_cert2 オプションを設定します)。"
-#: ../clients/common/settings-docs.c.in:89
-msgid ""
-"If TRUE, enforce auto-negotiation of port speed and duplex mode. If FALSE, "
-"\"speed\" and \"duplex\" properties should be both set or link configuration "
-"will be skipped."
-msgstr ""
-"TRUE の場合は、ポート速度と二重モードの自動ネゴシエーションを強制します。"
-"FALSE の場合は、\"speed\" プロパティーと \"duplex\" プロパティーが両方設定さ"
-"れるか、リンク設定がスキップされます。"
-
-#: ../clients/common/settings-docs.c.in:90
-#, fuzzy
-msgid ""
-"If specified, request that the device use this MAC address instead. This is "
-"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
-"address, the special values \"preserve\", \"permanent\", \"random\" and "
-"\"stable\" are supported. \"preserve\" means not to touch the MAC address on "
-"activation. \"permanent\" means to use the permanent hardware address if the "
-"device has one (otherwise this is treated as \"preserve\"). \"random\" "
-"creates a random MAC address on each connect. \"stable\" creates a hashed "
-"MAC address based on connection.stable-id and a machine dependent key. If "
-"unspecified, the value can be overwritten via global defaults, see manual of "
-"NetworkManager.conf. If still unspecified, it defaults to \"preserve"
-"\" (older versions of NetworkManager may use a different default value). On "
-"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
-"\"cloned-mac-address\"."
+#: ../clients/common/settings-docs.h.in:91
+msgid ""
+"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
+"and \"duplex\" properties are both specified, only that single mode will be "
+"advertised and accepted during the link auto-negotiation process: this works "
+"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
+"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
+"\" and \"duplex\" properties should be both set or link configuration will "
+"be skipped."
+msgstr ""
+"TRUE の場合は、速度と二重モードの自動ネゴシエーションを強制します。\"speed\" "
+"プロパティーと \"duplex\" プロパティーが両方とも指定される場合、リンク自動ネ"
+"ゴシエーションのプロセスの間、1 つのモードのみがアドバタイズされ、受け入れら"
+"れます。これは、BASE-T 802.3 仕様のみで機能し、ギガビットモードの強制に役立ち"
+"ます。なぜなら、このようなケースでは、リンクネゴシエーションは必須だからで"
+"す。FALSE の場合は、\"speed\" プロパティーと \"duplex\" プロパティーが両方と"
+"も設定されるか、リンク設定がスキップされます。"
+
+#: ../clients/common/settings-docs.h.in:92
+msgid ""
+"If specified, request that the device use this MAC address instead of its "
+"permanent MAC address. This is known as MAC cloning or spoofing. Beside "
+"explicitly specifying a MAC address, the special values \"preserve\", "
+"\"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means "
+"not to touch the MAC address on activation. \"permanent\" means to use the "
+"permanent hardware address if the device has one (otherwise this is treated "
+"as \"preserve\"). \"random\" creates a random MAC address on each connect. "
+"\"stable\" creates a hashed MAC address based on connection.stable-id and a "
+"machine dependent key. If unspecified, the value can be overwritten via "
+"global defaults, see manual of NetworkManager.conf. If still unspecified, it "
+"defaults to \"permanent\". On D-Bus, this field is expressed as \"assigned-"
+"mac-address\" or the deprecated \"cloned-mac-address\"."
msgstr ""
"指定した場合は、デバイスが、その永続化 MAC アドレスの代わりにこの MAC アドレ"
"スを使用する必要があります。これは、MAC クローニングまたはスプーフィングとし"
@@ -7023,20 +7101,33 @@ msgstr ""
"す。D-Bus において、このフィールドは \"assigned-mac-address\" または廃止予定"
"の \"cloned-mac-address\" として表示されます。"
-#: ../clients/common/settings-docs.c.in:91
-msgid ""
-"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
-"statically configures the device to use that specified duplex mode, either "
-"\"half\" or \"full\". Must be set together with the \"speed\" property if "
-"specified. Before specifying a duplex mode be sure your device supports it."
-msgstr ""
-"\"auto-negotiate\" が \"off\" になっている場合に限り指定できます。この場合、"
-"デバイスが、デュプレックスモード \"half\" または \"full\" を指定したデバイス"
-"を使用するように静的に設定します。指定する場合は \"speed\" プロパティーも設定"
-"する必要があります。デュプレックスモードを指定する前に、デバイスがそのモード"
-"をサポートすることを確認してください。"
-
-#: ../clients/common/settings-docs.c.in:93
+#: ../clients/common/settings-docs.h.in:93
+msgid ""
+"When a value is set, either \"half\" or \"full\", configures the device to "
+"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
+"specified duplex mode will be the only one advertised during link "
+"negotiation: this works only for BASE-T 802.3 specifications and is useful "
+"for enforcing gigabits modes, as in these cases link negotiation is "
+"mandatory. If the value is unset (the default), the link configuration will "
+"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
+"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
+"advertise all the supported duplex modes. Must be set together with the "
+"\"speed\" property if specified. Before specifying a duplex mode be sure "
+"your device supports it."
+msgstr ""
+"値が \"half\" または \"full\" のいずれかに設定されている場合、指定された二重"
+"モードを使用するようにデバイスを設定します。\"auto-negotiate\" が \"yes\" の"
+"場合、リンクネゴシエーションの間にアドバタイズされるのは、指定された二重モー"
+"ドだけになります。これは、BASE-T 802.3 仕様のみで機能し、ギガビットモードの強"
+"制に役立ちます。なぜなら、このようなケースでは、リンクネゴシエーションは必須"
+"だからです。値が設定されていない場合 (デフォルト)、リンクの設定はスキップされ"
+"るか (\"auto-negotiate\" が \"no\" の場合 = デフォルト)、自動ネゴシエートされ"
+"るか (\"auto-negotiate\" が \"yes\" の場合) のいずれかとなり、ローカルデバイ"
+"スはすべてのサポートされる二重モードをアドバタイズします。指定する場合は "
+"\"speed\" プロパティーも設定する必要があります。二重モードを指定する前に、デ"
+"バイスがそのモードをサポートすることを確認してください。"
+
+#: ../clients/common/settings-docs.h.in:95
msgid ""
"If specified, this connection will only apply to the Ethernet device whose "
"permanent MAC address matches. This property does not change the MAC address "
@@ -7046,7 +7137,7 @@ msgstr ""
"適用されます。このプロパティーは、デバイスの MAC アドレスを変更しません (MAC "
"スプーフィング)。"
-#: ../clients/common/settings-docs.c.in:94
+#: ../clients/common/settings-docs.h.in:96
msgid ""
"If specified, this connection will never apply to the Ethernet device whose "
"permanent MAC address matches an address in the list. Each MAC address is "
@@ -7056,7 +7147,7 @@ msgstr ""
"Ethernet デバイスには適用されません。 各 MAC アドレスは、標準の 16 進数とコロ"
"ン (00:11:22:33:44:55) で指定する必要があります。"
-#: ../clients/common/settings-docs.c.in:97
+#: ../clients/common/settings-docs.h.in:99
msgid ""
"Specific port type to use if the device supports multiple attachment "
"methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -7068,7 +7159,7 @@ msgstr ""
"ネット)、または \"mii\" (メディア独立インターフェース) のいずれかになります。"
"デバイスがポートのタイプを 1 つだけサポートする場合、この設定は無視されます。"
-#: ../clients/common/settings-docs.c.in:98
+#: ../clients/common/settings-docs.h.in:100
msgid ""
"s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
"the different types of virtual network devices available on s390 systems."
@@ -7077,7 +7168,7 @@ msgstr ""
"かになります。s390 システムで利用可能なさまざまな仮想ネットワークデバイスにな"
"ります。"
-#: ../clients/common/settings-docs.c.in:99
+#: ../clients/common/settings-docs.h.in:101
msgid ""
"Dictionary of key/value pairs of s390-specific device options. Both keys "
"and values must be strings. Allowed keys include \"portno\", \"layer2\", "
@@ -7089,7 +7180,7 @@ msgstr ""
"\"、\"layer2\"、\"portname\"、\"protocol\" などのキーが使用できます。キー名に"
"は、英数字のみ (つまり [a-zA-Z0-9]) が使用できます。"
-#: ../clients/common/settings-docs.c.in:100
+#: ../clients/common/settings-docs.h.in:102
msgid ""
"Identifies specific subchannels that this network device uses for "
"communication with z/VM or s390 host. Like the \"mac-address\" property for "
@@ -7105,21 +7196,33 @@ msgstr ""
"文字列が含まれている必要があり、各文字列には、16 進数とピリオド (.) だけを使"
"用できます。"
-#: ../clients/common/settings-docs.c.in:101
-msgid ""
-"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
-"\". In that case, statically configures the device to use that specified "
-"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
-"\" property when non-zero. Before specifying a speed value be sure your "
-"device supports it."
-msgstr ""
-"\"auto-negotiate\" が \"off\" になっている場合に限り、ゼロより大きな値を設定"
-"できます。この場合、デバイスが指定した速度を使用するように、静的に設定しま"
-"す。Mbit/s では 100 == 100Mbit/s です。ゼロ以外にする場合は、\"duplex\" プロ"
-"パティーも設定する必要があります。速度値を指定する前に、デバイスがその速度を"
-"サポートすることを確認してください。"
-
-#: ../clients/common/settings-docs.c.in:102
+#: ../clients/common/settings-docs.h.in:103
+msgid ""
+"When a value grater than 0 is set, configures the device to use the "
+"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
+"be the only one advertised during link negotiation: this works only for BASE-"
+"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
+"this case link negotiation is mandatory. If the value is unset (0, the "
+"default), the link configuration will be either skipped (if \"auto-negotiate"
+"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
+"is \"yes\") and the local device will advertise all the supported speeds. In "
+"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
+"property when non-zero. Before specifying a speed value be sure your device "
+"supports it."
+msgstr ""
+"0 より大きな値が設定されている場合、指定された速度を使用するようにデバイスを"
+"設定します。\"auto-negotiate\" が \"yes\" の場合、リンクネゴシエーションの間"
+"にアドバタイズされるのは、指定された速度だけになります。これは、BASE-T 802.3 "
+"仕様のみで機能し、ギガビット速度の強制に役立ちます。なぜなら、このケースで"
+"は、リンクネゴシエーションは必須だからです。値が設定されていない場合 (0 = デ"
+"フォルト)、リンクの設定はスキップされるか (\"auto-negotiate\" が \"no\" の場"
+"合 = デフォルト)、自動ネゴシエートされるか (\"auto-negotiate\" が \"yes\" の"
+"場合) のいずれかとなり、ローカルデバイスはすべてのサポートされる速度をアドバ"
+"タイズします。Mbit/s では 100 == 100Mbit/s です。ゼロ以外にする場合"
+"は、\"duplex\" プロパティーも設定する必要があります。速度値を指定する前に、デ"
+"バイスがその速度をサポートすることを確認してください。"
+
+#: ../clients/common/settings-docs.h.in:104
msgid ""
"The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
"options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7141,7 +7244,7 @@ msgstr ""
"設定を使用) および NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) "
"(NetworkManager で Wake-on-LAN の管理を無効) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:103
+#: ../clients/common/settings-docs.h.in:105
msgid ""
"If specified, the password used with magic-packet-based Wake-on-LAN, "
"represented as an Ethernet MAC address. If NULL, no password will be "
@@ -7151,36 +7254,36 @@ msgstr ""
"Ethernet の MAC アドレスとして表示されます。NULL にすると、パスワードは要求さ"
"れません。"
-#: ../clients/common/settings-docs.c.in:104
+#: ../clients/common/settings-docs.h.in:106
msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
msgstr "ADSL 接続のカプセル化。\"vcmux\" または \"llc\" にできます。"
-#: ../clients/common/settings-docs.c.in:106
+#: ../clients/common/settings-docs.h.in:108
msgid "Password used to authenticate with the ADSL service."
msgstr "ADSL サービスでの認証に使用するパスワード。"
-#: ../clients/common/settings-docs.c.in:108
+#: ../clients/common/settings-docs.h.in:110
msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
msgstr ""
"ADSL 接続プロトコル。\"pppoa\"、\"pppoe\"、または \"ipoatm\" にできます。"
-#: ../clients/common/settings-docs.c.in:109
+#: ../clients/common/settings-docs.h.in:111
msgid "Username used to authenticate with the ADSL service."
msgstr "ユーザー名は、ADSL サービスでの認証に使用されました。"
-#: ../clients/common/settings-docs.c.in:110
+#: ../clients/common/settings-docs.h.in:112
msgid "VCI of ADSL connection"
msgstr "ADSL 接続の VCI"
-#: ../clients/common/settings-docs.c.in:111
+#: ../clients/common/settings-docs.h.in:113
msgid "VPI of ADSL connection"
msgstr "ADSL 接続の VPI"
-#: ../clients/common/settings-docs.c.in:112
+#: ../clients/common/settings-docs.h.in:114
msgid "The Bluetooth address of the device."
msgstr "デバイスの Bluetooth アドレス。"
-#: ../clients/common/settings-docs.c.in:114
+#: ../clients/common/settings-docs.h.in:116
msgid ""
"Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
"Area Networking connections to devices supporting the NAP profile."
@@ -7189,7 +7292,7 @@ msgstr ""
"キング接続の場合) または \"panu\" (パーソナルエリアネットワーキング接続の場"
"合) のいずれか。"
-#: ../clients/common/settings-docs.c.in:116
+#: ../clients/common/settings-docs.h.in:118
msgid ""
"Dictionary of key/value pairs of bonding options. Both keys and values must "
"be strings. Option names must contain only alphanumeric characters (ie, [a-"
@@ -7199,15 +7302,15 @@ msgstr ""
"と値の両方を文字列にする必要があります。オプション名には英数字のみ (つまり "
"[a-zA-Z0-9]) を使用できます。"
-#: ../clients/common/settings-docs.c.in:117
+#: ../clients/common/settings-docs.h.in:119
msgid "The Ethernet MAC address aging time, in seconds."
msgstr "Ethernet MAC アドレスのエージングタイム (秒単位)。"
-#: ../clients/common/settings-docs.c.in:118
+#: ../clients/common/settings-docs.h.in:120
msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
msgstr "スパニングツリープロトコル (STP) フォワード遅延 (秒単位)。"
-#: ../clients/common/settings-docs.c.in:119
+#: ../clients/common/settings-docs.h.in:121
msgid ""
"A mask of group addresses to forward. Usually, group addresses in the range "
"from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7221,12 +7324,11 @@ msgstr ""
"対応します。マスクは、STP、MAC 停止フレーム、および LACP に使用されているた"
"め、ビット 0、1、または 2 を設定することはできません。"
-#: ../clients/common/settings-docs.c.in:120
+#: ../clients/common/settings-docs.h.in:122
msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
msgstr "スパニングツリープロトコル (STP) Hello タイム (秒単位)。"
-#: ../clients/common/settings-docs.c.in:121
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:123
msgid ""
"If specified, the MAC address of bridge. When creating a new bridge, this "
"MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7240,12 +7342,13 @@ msgstr ""
"mac-address\" が代わりに参照され、初期 MAC アドレスが生成されま"
"す。\"ethernet.cloned-mac-address\" は、ブリッジのアクティベート中に、ブリッ"
"ジの MAC アドレスを上書きします。したがって、このプロパティーは廃止されます。"
+"非推奨: 1"
-#: ../clients/common/settings-docs.c.in:122
+#: ../clients/common/settings-docs.h.in:124
msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
msgstr "スパニングツリープロトコル (STP) メッセージ最大期間 (秒単位)。"
-#: ../clients/common/settings-docs.c.in:123
+#: ../clients/common/settings-docs.h.in:125
msgid ""
"Controls whether IGMP snooping is enabled for this bridge. Note that if "
"snooping was automatically disabled due to hash collisions, the system may "
@@ -7255,7 +7358,7 @@ msgstr ""
"不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決す"
"るまでこの機能が有効にならないことがあります。"
-#: ../clients/common/settings-docs.c.in:125
+#: ../clients/common/settings-docs.h.in:127
msgid ""
"Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
"values are \"better\"; the lowest priority bridge will be elected the root "
@@ -7265,14 +7368,14 @@ msgstr ""
"が小さい方が優先度が高くなります。優先度が一番低いブリッジが root ブリッジに"
"選択されます。"
-#: ../clients/common/settings-docs.c.in:126
+#: ../clients/common/settings-docs.h.in:128
msgid ""
"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
msgstr ""
"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し"
"ます。"
-#: ../clients/common/settings-docs.c.in:127
+#: ../clients/common/settings-docs.h.in:129
msgid ""
"Enables or disables \"hairpin mode\" for the port, which allows frames to be "
"sent back out through the port the frame was received on."
@@ -7280,19 +7383,19 @@ msgstr ""
"ポートの \"hairpin mode\" を有効または無効にします。このモードでは、フレーム"
"を受け取ったポートからフレームを送り戻すことができます。"
-#: ../clients/common/settings-docs.c.in:129
+#: ../clients/common/settings-docs.h.in:131
msgid ""
"The Spanning Tree Protocol (STP) port cost for destinations via this port."
msgstr ""
"このポートを経由した、宛先のスパニングツリープロトコル (STP) ポートコスト。"
-#: ../clients/common/settings-docs.c.in:130
+#: ../clients/common/settings-docs.h.in:132
msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
msgstr "このブリッジポートのスパニングツリープロトコル (STP) の優先度。"
-#: ../clients/common/settings-docs.c.in:131
-#: ../clients/common/settings-docs.c.in:179
-#: ../clients/common/settings-docs.c.in:191
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:194
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple frames."
@@ -7300,7 +7403,7 @@ msgstr ""
"ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定したサイズよ"
"り大きいパケットは、複数のフレームに分割されます。"
-#: ../clients/common/settings-docs.c.in:133
+#: ../clients/common/settings-docs.h.in:135
msgid ""
"The number to dial to establish the connection to the CDMA-based mobile "
"broadband network, if any. If not specified, the default number (#777) is "
@@ -7310,8 +7413,8 @@ msgstr ""
"号があれば指定します。指定しない場合は、必要に応じてデフォルトの番号 (#777) "
"が使用されます。"
-#: ../clients/common/settings-docs.c.in:134
-#: ../clients/common/settings-docs.c.in:183
+#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:186
msgid ""
"The password used to authenticate with the network, if required. Many "
"providers do not require a password, or accept any password. But if a "
@@ -7321,8 +7424,8 @@ msgstr ""
"ダーでパスワードを必要としないか、いかなるパスワードも許可されます。パスワー"
"ドが必要な場合は、ここで指定します。"
-#: ../clients/common/settings-docs.c.in:136
-#: ../clients/common/settings-docs.c.in:189
+#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:192
msgid ""
"The username used to authenticate with the network, if required. Many "
"providers do not require a username, or accept any username. But if a "
@@ -7332,7 +7435,7 @@ msgstr ""
"ダーでユーザー名を必要としないか、いかなるユーザー名も許可されます。ユーザー"
"名が必要な場合は、ここで指定します。"
-#: ../clients/common/settings-docs.c.in:137
+#: ../clients/common/settings-docs.h.in:139
msgid ""
"The number of retries for the authentication. Zero means to try "
"indefinitely; -1 means to use a global default. If the global default is not "
@@ -7344,18 +7447,22 @@ msgstr ""
"は、認証を 3 回再試行したら接続に失敗します。現在、これは 802-1x 認証にのみ適"
"用されます。"
-#: ../clients/common/settings-docs.c.in:138
+#: ../clients/common/settings-docs.h.in:140
msgid ""
"Whether or not the connection should be automatically connected by "
"NetworkManager when the resources for the connection are available. TRUE to "
"automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection."
+"to activate the connection. Note that autoconnect is not implemented for VPN "
+"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
+"profiles."
msgstr ""
"接続のリソースが利用可能な場合に、NetworkManager が接続を自動的に行うかどう"
"か。TRUE の場合は接続が自動的に有効になり、FALSE の場合は手作業で接続を有効化"
-"します。"
+"します。自動接続は VPN プロファイルでは実装されない点に注意してください。VPN "
+"プロファイル を自動接続する別の方法として \"secondaries\" を参照してくださ"
+"い。"
-#: ../clients/common/settings-docs.c.in:139
+#: ../clients/common/settings-docs.h.in:141
msgid ""
"The autoconnect priority. If the connection is set to autoconnect, "
"connections with higher priority will be preferred. Defaults to 0. The "
@@ -7364,7 +7471,7 @@ msgstr ""
"自動接続の優先度。接続を自動接続に設定すると、優先度の高い接続が優先されま"
"す。デフォルトは 0 です。数値が高くなると、優先度が高くなります。"
-#: ../clients/common/settings-docs.c.in:140
+#: ../clients/common/settings-docs.h.in:142
msgid ""
"The number of times a connection should be tried when autoactivating before "
"giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7377,24 +7484,27 @@ msgstr ""
"定すると、1 度だけ有効にしてから自動接続をブロックします。タイムアウト後、"
"NetworkManager が再度、自動接続を試行することに注意してください。"
-#: ../clients/common/settings-docs.c.in:141
+#: ../clients/common/settings-docs.h.in:143
msgid ""
"Whether or not slaves of this connection should be automatically brought up "
"when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The permitted values are: 0: leave slave connections "
-"untouched, 1: activate all the slave connections with this connection, -1: "
-"default. If -1 (default) is set, global connection.autoconnect-slaves is "
-"read to determine the real value. If it is default as well, this fallbacks "
-"to 0."
+"for master connections. The properties \"autoconnect\", \"autoconnect-"
+"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
+"permitted values are: 0: leave slave connections untouched, 1: activate all "
+"the slave connections with this connection, -1: default. If -1 (default) is "
+"set, global connection.autoconnect-slaves is read to determine the real "
+"value. If it is default as well, this fallbacks to 0."
msgstr ""
"NetworkManager がこの接続を有効にした場合に、この接続のスレーブが自動的に起動"
-"するかどうか。これは、マスター接続にのみ有効です。利用できる値は、0: スレーブ"
-"接続は変更しない、1: この接続のスレーブ接続をすべてアクティブにする、-1: デ"
-"フォルトになります。-1 (デフォルト) に設定されている場合は、グローバルの "
-"connection.autoconnect-slaves が読み込まれて値が決定します。これもデフォルト"
-"に設定されている場合は、0 にフォールバックされます。"
+"するかどうか。これは、マスター接続にのみ有効です。\"autoconnect"
+"\"、\"autoconnect-priority\"、および \"autoconnect-retries\" の各プロパティー"
+"は、この設定とは関係ありません。利用できる値は、0: スレーブ接続は変更しない、"
+"1: この接続のスレーブ接続をすべてアクティブにする、-1: デフォルトになりま"
+"す。-1 (デフォルト) に設定されている場合は、グローバルの connection."
+"autoconnect-slaves が読み込まれて値が決定します。これもデフォルトに設定されて"
+"いる場合は、0 にフォールバックされます。"
-#: ../clients/common/settings-docs.c.in:142
+#: ../clients/common/settings-docs.h.in:144
msgid ""
"If greater than zero, delay success of IP addressing until either the "
"timeout is reached, or an IP gateway replies to a ping."
@@ -7402,14 +7512,14 @@ msgstr ""
"ゼロより大きくすると、タイムアウトに到達するか、IP ゲートウェイが ping に応答"
"するまで、IP アドレスの遅延に成功します。"
-#: ../clients/common/settings-docs.c.in:143
+#: ../clients/common/settings-docs.h.in:145
msgid ""
"A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
"or \"T-Mobile 3G\"."
msgstr ""
"\"Work Wi-Fi\" や \"T-Mobile 3G\" など、人が判別できる接続の一意識別子。"
-#: ../clients/common/settings-docs.c.in:144
+#: ../clients/common/settings-docs.h.in:146
msgid ""
"The name of the network interface this connection is bound to. If not set, "
"then the connection can be attached to any interface of the appropriate type "
@@ -7430,15 +7540,31 @@ msgstr ""
"使用できるインターフェースを制限し、インターフェース名を変更したり、順番を変"
"更すると、誤ったインターフェースに接続が適用される場合があります。"
-#: ../clients/common/settings-docs.c.in:145
+#: ../clients/common/settings-docs.h.in:147
msgid "Whether LLDP is enabled for the connection."
msgstr "この接続に対して LLDP が有効であるかどうか。"
-#: ../clients/common/settings-docs.c.in:146
+#: ../clients/common/settings-docs.h.in:148
msgid "Interface name of the master device or UUID of the master connection."
msgstr "マスター接続のマスターデバイスまたは UUID のインターフェース名。"
-#: ../clients/common/settings-docs.c.in:147
+#: ../clients/common/settings-docs.h.in:149
+msgid ""
+"Whether mDNS is enabled for the connection. The permitted values are: yes: "
+"register hostname and resolving for the connection, no: disable mDNS for the "
+"interface, resolve: do not register hostname but allow resolving of mDNS "
+"host names. When updating this property on a currently activated connection, "
+"the change takes effect immediately. This feature requires a plugin which "
+"supports mDNS. One such plugin is dns-systemd-resolved."
+msgstr ""
+"mDNS の接続が実行されるかどうか。利用できる値は、yes: ホスト名を登録して接続"
+"を解決、no: インターフェースに対して mDNS を無効にする 、resolve: ホスト名を"
+"登録せずに mDNS ホスト名の解決を許可、の 3 つになります。現在有効な接続でこの"
+"プロパティーをアップデートすると、変更はすぐに有効になります。この機能には、"
+"mDNS をサポートするプラグインが必要です。たとえば、dns-systemd-resolved など"
+"です。"
+
+#: ../clients/common/settings-docs.h.in:150
msgid ""
"Whether the connection is metered. When updating this property on a "
"currently activated connection, the change takes effect immediately."
@@ -7446,7 +7572,7 @@ msgstr ""
"接続を測定するかどうか。現在有効な接続でこのプロパティーをアップデートする"
"と、変更はすぐに有効になります。"
-#: ../clients/common/settings-docs.c.in:149
+#: ../clients/common/settings-docs.h.in:152
msgid ""
"An array of strings defining what access a given user has to this "
"connection. If this is NULL or empty, all users are allowed to access this "
@@ -7466,13 +7592,13 @@ msgstr ""
"す。これが空になっていないと、指定したユーザーの 1 人がアクティブなセッション"
"にログインした場合に限り、接続はアクティブになります。各エントリーの形式は "
"\"[type]:[id]:[reserved]\" (たとえば \"user:dcbw:blah\") となります。その他の"
-"値は無視され、今後の使用のために予約されます。現時点では、ユーザー\" の "
-"[type] だけが利用できます。[id] は、この権限が参照するユーザー名で、\":\" 文"
-"字は使用できません。表示されている [reserved] 情報は無視され、今後使用される"
-"ために予約される必要があります。[type]、[id]、および [reserved] はすべて有効"
-"な UTF-8 にする必要があります。"
+"値は無視され、今後の使用のために予約されます。現時点では、\"user\" の [type] "
+"だけが利用できます。[id] は、この権限が参照するユーザー名で、\":\" 文字は使用"
+"できません。表示されている [reserved] 情報は無視され、今後使用されるために予"
+"約される必要があります。[type]、[id]、および [reserved] はすべて有効な UTF-8 "
+"にする必要があります。"
-#: ../clients/common/settings-docs.c.in:150
+#: ../clients/common/settings-docs.h.in:153
msgid ""
"FALSE if the connection can be modified using the provided settings "
"service's D-Bus interface with the right privileges, or TRUE if the "
@@ -7481,7 +7607,7 @@ msgstr ""
"正しい権限で、提供された設定サービスの D-Bus インターフェースを使用して接続が"
"修正できる場合は FALSE、接続が読み取り専用で修正できない場合は TRUE。"
-#: ../clients/common/settings-docs.c.in:151
+#: ../clients/common/settings-docs.h.in:154
msgid ""
"List of connection UUIDs that should be activated when the base connection "
"itself is activated. Currently only VPN connections are supported."
@@ -7489,7 +7615,7 @@ msgstr ""
"ベース接続自身が有効になると有効になる接続の UUID リスト。現時点は、VPN 接続"
"のみがサポートされます。"
-#: ../clients/common/settings-docs.c.in:152
+#: ../clients/common/settings-docs.h.in:155
msgid ""
"Setting name of the device type of this slave's master connection (eg, \"bond"
"\"), or NULL if this connection is not a slave."
@@ -7497,48 +7623,64 @@ msgstr ""
"このスレーブのマスター接続 (\"bond\" など) のデバイスタイプの設定名。この接続"
"がスレーブではない場合は NULL。"
-#: ../clients/common/settings-docs.c.in:153
+#: ../clients/common/settings-docs.h.in:156
msgid ""
-"Token to generate stable IDs for the connection. The stable-id is used for "
+"This represents the identity of the connection used for various purposes. It "
+"allows to configure multiple profiles to share the identity. Also, the "
+"stable-id can contain placeholders that are substituted dynamically and "
+"deterministically depending on the context. The stable-id is used for "
"generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
"privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
-"that also the interface name of the activating connection and a per-host "
-"secret key is included into the address generation so that the same stable-"
-"id on different hosts/devices yields different addresses. If the value is "
-"unset, an ID unique for the connection is used. Specifying a stable-id "
-"allows multiple connections to generate the same addresses. Another use is "
-"to generate IDs at runtime via dynamic substitutions. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
+"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
+"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
+"depending on the context where it is used, other parameters are also seeded "
+"into the generation algorithm. For example, a per-host key is commonly also "
+"included, so that different systems end up generating different IDs. Or with "
+"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
+"that different interfaces yield different addresses. The '$' character is "
"treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
-"effectively create unique IDs per-connection, per-boot, or every time. Any "
-"unrecognized patterns following '$' are treated verbatim, however are "
-"reserved for future use. You are thus advised to avoid '$' or escape it as "
-"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
-"id for this connection that changes with every reboot. Note that two "
-"connections only use the same effective id if their stable-id is also "
-"identical before performing dynamic substitutions."
-msgstr ""
-"接続に対する安定した ID を生成するトークン。stable-id は、ipv6.addr-gen-"
-"mode=stable-privacy で IPv6 の安定したプライベートアドレスを生成するのに使用"
-"されます。また、ethernet.cloned-mac-address=stable および wifi.cloned-mac-"
-"address=stable に対して生成されたクローンの MAC アドレスのシードにも使用され"
-"ます。有効な接続のインターフェイス名と、各ホストの秘密鍵をアドレス生成に追加"
-"すると、別のホストまたはデバイスで同じ stable-id が別のアドレスが生成されま"
-"す。値を設定しないと、接続に固有の ID を使用します。stable-id を指定すると、"
-"複数の接続で同じアドレスを生成できます。その他にも、動的置換によりランタイム"
-"時に ID を生成します。この '$' 文字は、ランタイム時に動的置換を実行するのに使"
-"用されます。現在サポートされているの"
-"は、\"${CONNECTION}\"、\"${BOOT}\"、\"${RANDOM}\" です。これは、各接続時、各"
-"起動時、または毎回、固有の ID を効果的に作成します。'$' に続く認識されていな"
-"いパターンは文字通りに扱われますが、今後使用されるために予約されます。した"
-"がって、これは '$' を使用しないか、またはエスケープ文字 \"$$\" として使用する"
-"ことが推奨されます。たとえば、これを \"${CONNECTION}/${BOOT}\" にすると、シス"
-"テムを再起動するたびに変更するこの接続に対して固有の ID を作成します。2 つの"
-"接続で、動的置換を行う前の stable-id も同じ場合は、有効で同じ ID だけを使用す"
-"ることに注意してください。"
+"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
+"These effectively create unique IDs per-connection, per-device, per-boot, or "
+"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
+"the device. Any unrecognized patterns following '$' are treated verbatim, "
+"however are reserved for future use. You are thus advised to avoid '$' or "
+"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
+"${DEVICE}\" to create a unique id for this connection that changes with "
+"every reboot and differs depending on the interface where the profile "
+"activates. If the value is unset, a global connection default is consulted. "
+"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
+"uses a unique, fixed ID for the connection."
+msgstr ""
+"これは、様々な目的で使用される接続のアイデンティティーを示しています。これに"
+"より、複数のプロファイルを設定してアイデンティティーを共有できます。また、"
+"stable-id には、コンテキストによって動的および確定的に置換されるプレースホル"
+"ダーを含むことができます。stable-id は、ipv6.addr-gen-mode=stable-privacy で "
+"IPv6 の安定したプライベートアドレスを生成するのに使用されます。また、"
+"ethernet.cloned-mac-address=stable および wifi.cloned-mac-address=stable に対"
+"して生成されるクローンの MAC アドレスのシードにも使用されます。これは、ipv4."
+"dhcp-client-id=stable の DHCP クライアント識別子としても使用され、ipv6.dhcp-"
+"duid=stable-[llt,ll,uuid] を使って DHCP DUID を取得する場合にも使用されます。"
+"使用される場所のコンテキストによっては、他のパラメーターも生成アルゴリズムに"
+"シードされることに注意してください。たとえば、別々のシステムが別々の ID を生"
+"成する結果となるように、一般にホストごとのキーも含まれています。または、ipv6."
+"addr-gen-mode=stable-privacy では、別々のインターフェースが別々のアドレスを生"
+"成するようにデバイス名も含まれています。この '$' 文字は、ランタイム時に動的置"
+"換を実行するのに使用されます。現在サポートされているの"
+"は、\"${CONNECTION}\"、\"${DEVICE}\"、\"${BOOT}\"、\"${RANDOM}\" です。これ"
+"は、各接続時、各デバイスごと、各起動時、または毎回、固有の ID を効果的に作成"
+"します。\"${DEVICE}\"は、デバイスのインターフェース名に対応している点に注意し"
+"てください。'$' に続く認識されていないパターンは文字通りに扱われますが、今後"
+"使用されるために予約されます。したがって、これは '$' を使用しないか、またはエ"
+"スケープ文字 \"$$\" として使用することが推奨されます。たとえば、これを "
+"\"${CONNECTION}-${BOOT}-${DEVICE}\" に設定すると、この接続に対して固有の ID "
+"を作成します。これは、システムを再起動するたびに変更され、プロファイルがアク"
+"ティベートされるインターフェースに応じて異なってきます。値が設定されていない"
+"場合は、グローバルな接続デフォルトを参考にします。引き続き値が設定されない場"
+"合は、デフォルトは \"${CONNECTION}\" と類似し、接続に固有の固定 ID を使用しま"
+"す。"
-#: ../clients/common/settings-docs.c.in:154
+#: ../clients/common/settings-docs.h.in:157
msgid ""
"The time, in seconds since the Unix Epoch, that the connection was last "
"_successfully_ fully activated. NetworkManager updates the connection "
@@ -7552,7 +7694,7 @@ msgstr ""
"のプロパティーは読み込みのためにのみ使用されます (このプロパティーへの変更は"
"保存されません)。"
-#: ../clients/common/settings-docs.c.in:155
+#: ../clients/common/settings-docs.h.in:158
msgid ""
"Base type of the connection. For hardware-dependent connections, should "
"contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7566,7 +7708,7 @@ msgstr ""
"存しない接続には、その設定のタイプ名 (つまり \"vpn\"、\"bridge\" など) が含ま"
"れる必要があります。"
-#: ../clients/common/settings-docs.c.in:156
+#: ../clients/common/settings-docs.h.in:159
msgid ""
"A universally unique identifier for the connection, for example generated "
"with libuuid. It should be assigned when the connection is created, and "
@@ -7586,7 +7728,7 @@ msgstr ""
"\"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数の文字と \"-\" だけが含まれ"
"る) になります。"
-#: ../clients/common/settings-docs.c.in:157
+#: ../clients/common/settings-docs.h.in:160
msgid ""
"The trust level of a the connection. Free form case-insensitive string (for "
"example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
@@ -7599,7 +7741,7 @@ msgstr ""
"は、ファイアウォールで定義したデフォルトゾーンに設定されます。現在アクティブ"
"な接続でこのプロパティーをアップデートすると、接続はすぐに有効になります。"
-#: ../clients/common/settings-docs.c.in:158
+#: ../clients/common/settings-docs.h.in:161
msgid ""
"Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7609,13 +7751,13 @@ msgstr ""
"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
"び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:159
+#: ../clients/common/settings-docs.h.in:162
msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
msgstr ""
"FCoE コントローラーモード; \"fabric\" (デフォルト) または \"vn2vn\" のいずれ"
"か。"
-#: ../clients/common/settings-docs.c.in:160
+#: ../clients/common/settings-docs.h.in:163
msgid ""
"The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
"default priority. Only used when the \"app-fcoe-flags\" property includes "
@@ -7625,7 +7767,7 @@ msgstr ""
"の優先度)。\"app-fcoe-flags\" プロパティーには NM_SETTING_DCB_FLAG_ENABLE "
"(0x1) フラグを含む場合に限り使用されます。"
-#: ../clients/common/settings-docs.c.in:161
+#: ../clients/common/settings-docs.h.in:164
msgid ""
"Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7635,7 +7777,7 @@ msgstr ""
"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
"び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:162
+#: ../clients/common/settings-docs.h.in:165
msgid ""
"The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
"default priority. Only used when the \"app-fip-flags\" property includes "
@@ -7645,7 +7787,7 @@ msgstr ""
"優先度)。\"app-fip-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE (0x1) フ"
"ラグを含める場合に限り使用します。"
-#: ../clients/common/settings-docs.c.in:163
+#: ../clients/common/settings-docs.h.in:166
msgid ""
"Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7655,7 +7797,7 @@ msgstr ""
"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
"び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:164
+#: ../clients/common/settings-docs.h.in:167
msgid ""
"The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
"default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -7665,7 +7807,7 @@ msgstr ""
"の優先度)。\"app-iscsi-flags\" プロパティーに NM_SETTING_DCB_FLAG_ENABLE "
"(0x1) フラグを追加する場合に限り使用します。"
-#: ../clients/common/settings-docs.c.in:166
+#: ../clients/common/settings-docs.h.in:169
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7678,7 +7820,7 @@ msgstr ""
"用するパーセンテージを示します。グループ内の合計を 100% にする必要がありま"
"す。"
-#: ../clients/common/settings-docs.c.in:167
+#: ../clients/common/settings-docs.h.in:170
msgid ""
"An array of 8 boolean values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -7687,7 +7829,7 @@ msgstr ""
"8 個のブール値の配列。配列のインデックスは、ユーザーの優先度 (0 - 7) に対応し"
"ます。値は、対応する優先度が、優先度の停止を送信するかどうかを示します。"
-#: ../clients/common/settings-docs.c.in:168
+#: ../clients/common/settings-docs.h.in:171
msgid ""
"Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
"may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7697,7 +7839,7 @@ msgstr ""
"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
"び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:169
+#: ../clients/common/settings-docs.h.in:172
msgid ""
"An array of 8 uint values, where the array index corresponds to the Priority "
"Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -7708,7 +7850,7 @@ msgstr ""
"します。値は、そのグループに割り当てられたリンク帯域幅のパーセンテージを示し"
"ます。使用できる値は 0 - 100 で、合計を 100 パーセントにする必要があります。"
-#: ../clients/common/settings-docs.c.in:170
+#: ../clients/common/settings-docs.h.in:173
msgid ""
"Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
"combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7718,7 +7860,7 @@ msgstr ""
"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2)、およ"
"び NM_SETTING_DCB_FLAG_WILLING (0x4) から組み合わせることができます。"
-#: ../clients/common/settings-docs.c.in:171
+#: ../clients/common/settings-docs.h.in:174
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
@@ -7728,7 +7870,7 @@ msgstr ""
"す。値は優先度グループ ID を示します。使用できる優先度グループ ID の値は 0 - "
"7 で、15 にすると無制限グループになります。"
-#: ../clients/common/settings-docs.c.in:172
+#: ../clients/common/settings-docs.h.in:175
msgid ""
"An array of 8 boolean values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -7738,7 +7880,7 @@ msgstr ""
"す。値は、その優先度を割り当てたグループに割り当てられたすべての帯域幅を、そ"
"の優先度が使用するかどうかを示します。"
-#: ../clients/common/settings-docs.c.in:173
+#: ../clients/common/settings-docs.h.in:176
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -7747,7 +7889,7 @@ msgstr ""
"8 uint 値の配列。配列のインデックスはユーザーの優先度 (0 - 7) に対応します。"
"値は、優先度がマッピングされるトラフィッククラス (0 - 7) を示しています。"
-#: ../clients/common/settings-docs.c.in:176
+#: ../clients/common/settings-docs.h.in:179
msgid ""
"The GPRS Access Point Name specifying the APN used when establishing a data "
"session with the GSM-based network. The APN often determines how the user "
@@ -7764,7 +7906,7 @@ msgstr ""
"ロードバンドプランに対して正しい APN を使用することが重要です。APN の文字列"
"は、a- z と 0 - 9 だけが使用でき、GSM 03.60 セクション 14.9 に準拠します。"
-#: ../clients/common/settings-docs.c.in:177
+#: ../clients/common/settings-docs.h.in:180
msgid ""
"The device unique identifier (as given by the WWAN management service) which "
"this connection applies to. If given, the connection will only apply to the "
@@ -7773,7 +7915,7 @@ msgstr ""
"(WWAN 管理サービスで指定されたように) この接続が適用されるデバイスの一意識別"
"子。これを指定すると、接続は、指定したデバイスにのみ適用されます。"
-#: ../clients/common/settings-docs.c.in:178
+#: ../clients/common/settings-docs.h.in:181
msgid ""
"When TRUE, only connections to the home network will be allowed. Connections "
"to roaming networks will not be made."
@@ -7781,7 +7923,7 @@ msgstr ""
"TRUE にすると、ホームネットワークへの接続だけが可能になります。ローミングネッ"
"トワークへの接続は作成されません。"
-#: ../clients/common/settings-docs.c.in:181
+#: ../clients/common/settings-docs.h.in:184
msgid ""
"The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
"registration. If the Network ID is specified, NetworkManager will attempt "
@@ -7794,7 +7936,7 @@ msgstr ""
"のみデバイスの登録を強制しようとします。これは、デバイスのローミングを阻止す"
"るために使用できます。 これ以外に、ローミングを直接制御することはできません。"
-#: ../clients/common/settings-docs.c.in:182
+#: ../clients/common/settings-docs.h.in:185
msgid ""
"Number to dial when establishing a PPP data session with the GSM-based "
"mobile broadband network. Many modems do not require PPP for connections to "
@@ -7806,7 +7948,7 @@ msgstr ""
"め、このプロパティーは空のままにして、NetworkManager が自動的に適切な設定を選"
"択するようにする必要があります。"
-#: ../clients/common/settings-docs.c.in:185
+#: ../clients/common/settings-docs.h.in:188
msgid ""
"If the SIM is locked with a PIN it must be unlocked before any other "
"operations are requested. Specify the PIN here to allow operation of the "
@@ -7815,7 +7957,7 @@ msgstr ""
"PIN で SIM がロックされた場合は、その他の操作を行う前にアンロックする必要があ"
"ります。ここで PIN を指定すると、デバイスの操作が可能になります。"
-#: ../clients/common/settings-docs.c.in:187
+#: ../clients/common/settings-docs.h.in:190
msgid ""
"The SIM card unique identifier (as given by the WWAN management service) "
"which this connection applies to. If given, the connection will apply to "
@@ -7826,7 +7968,7 @@ msgstr ""
"一意識別子。これを指定すると、接続は、\"device-id\" にも許可されているデバイ"
"スに適用されます。これには、指定した識別子に一致する SIM カードが含まれます。"
-#: ../clients/common/settings-docs.c.in:188
+#: ../clients/common/settings-docs.h.in:191
msgid ""
"A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
"mobile network operator which this connection applies to. If given, the "
@@ -7838,7 +7980,7 @@ msgstr ""
"\" および \"sim-id\" で許可されるデバイスにも適用されます。これには、指定した"
"オペレーターから提供される SIM カードが含まれます。"
-#: ../clients/common/settings-docs.c.in:190
+#: ../clients/common/settings-docs.h.in:193
msgid ""
"If specified, this connection will only apply to the IPoIB device whose "
"permanent MAC address matches. This property does not change the MAC address "
@@ -7848,7 +7990,7 @@ msgstr ""
"用されます。このプロパティーはデバイスの MAC アドレスを変更しません (MAC ス"
"プーフィング)。"
-#: ../clients/common/settings-docs.c.in:193
+#: ../clients/common/settings-docs.h.in:196
msgid ""
"The InfiniBand P_Key to use for this device. A value of -1 means to use the "
"default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
@@ -7859,7 +8001,7 @@ msgstr ""
"署名なし整数です。\"完全メンバーシップ\" の P_Key の場合は、その高ビットが設"
"定されます。"
-#: ../clients/common/settings-docs.c.in:194
+#: ../clients/common/settings-docs.h.in:197
msgid ""
"The interface name of the parent device of this device. Normally NULL, but "
"if the \"p_key\" property is set, then you must specify the base device by "
@@ -7869,13 +8011,13 @@ msgstr ""
"プロパティーが設定されると、このプロパティーまたは \"mac-address\" のいずれか"
"を設定して、ベースデバイスを指定する必要があります。"
-#: ../clients/common/settings-docs.c.in:195
+#: ../clients/common/settings-docs.h.in:198
msgid ""
"The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
msgstr ""
"IPoIB トランスポートモード。\"datagram\" または \"connected\" のいずれか。"
-#: ../clients/common/settings-docs.c.in:196
+#: ../clients/common/settings-docs.h.in:199
msgid ""
"How many additional levels of encapsulation are permitted to be prepended to "
"packets. This property applies only to IPv6 tunnels."
@@ -7883,7 +8025,25 @@ msgstr ""
"パケットの先頭にカプセル化レベルをどのぐらい追加できるか。このプロパティー"
"は、IPv6 トンネルにのみ適用されます。"
-#: ../clients/common/settings-docs.c.in:197
+#: ../clients/common/settings-docs.h.in:200
+msgid ""
+"Tunnel flags. Currently the following values are supported: "
+"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
+"for IPv6 tunnels."
+msgstr ""
+"トンネルフラグ。現在、以下の値がサポートされています。 "
+"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). これらは、IPv6 トンネル"
+"のみに有効です。"
+
+#: ../clients/common/settings-docs.h.in:201
msgid ""
"The flow label to assign to tunnel packets. This property applies only to "
"IPv6 tunnels."
@@ -7891,7 +8051,7 @@ msgstr ""
"トンネルパケットに割り当てるフローラベル。このプロパティーは、IPv6 にのみ適用"
"されます。"
-#: ../clients/common/settings-docs.c.in:198
+#: ../clients/common/settings-docs.h.in:202
msgid ""
"The key used for tunnel input packets; the property is valid only for "
"certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -7899,7 +8059,7 @@ msgstr ""
"トンネル入力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
"ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-#: ../clients/common/settings-docs.c.in:199
+#: ../clients/common/settings-docs.h.in:203
msgid ""
"The local endpoint of the tunnel; the value can be empty, otherwise it must "
"contain an IPv4 or IPv6 address."
@@ -7907,7 +8067,7 @@ msgstr ""
"トンネルのローカルエンドポイント。値は空にできます。もしくは、IPv4 アドレスま"
"たは IPv6 アドレスを含む必要があります。"
-#: ../clients/common/settings-docs.c.in:200
+#: ../clients/common/settings-docs.h.in:204
msgid ""
"The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
"NM_IP_TUNNEL_MODE_GRE (2)."
@@ -7915,7 +8075,7 @@ msgstr ""
"トンネリングモード。たとえば NM_IP_TUNNEL_MODE_IPIP (1) や "
"NM_IP_TUNNEL_MODE_GRE (2)。"
-#: ../clients/common/settings-docs.c.in:201
+#: ../clients/common/settings-docs.h.in:205
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple fragments."
@@ -7923,15 +8083,15 @@ msgstr ""
"ゼロ以外は、指定したサイズ以下のパケットだけが送信されます。指定より大きいパ"
"ケットは、複数のフラグメントに分割されます。"
-#: ../clients/common/settings-docs.c.in:203
+#: ../clients/common/settings-docs.h.in:207
msgid ""
"The key used for tunnel output packets; the property is valid only for "
"certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
msgstr ""
-"トンネル出力パケットに使用されるキー。このプロパティは、特定のトンネルモード "
-"(GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
+"トンネル出力パケットに使用されるキー。このプロパティーは、特定のトンネルモー"
+"ド (GRE、IP6GRE) に対してのみ有効です。空にすると、キーは使用されません。"
-#: ../clients/common/settings-docs.c.in:204
+#: ../clients/common/settings-docs.h.in:208
msgid ""
"If given, specifies the parent interface name or parent connection UUID the "
"new device will be bound to so that tunneled packets will only be routed via "
@@ -7941,11 +8101,11 @@ msgstr ""
"うに、新しいデバイスがバインドされる親インターフェース名または親接続の UUID "
"を指定します。"
-#: ../clients/common/settings-docs.c.in:205
+#: ../clients/common/settings-docs.h.in:209
msgid "Whether to enable Path MTU Discovery on this tunnel."
msgstr "このトンネルで、パス MTU 検出を有効にするかどうか。"
-#: ../clients/common/settings-docs.c.in:206
+#: ../clients/common/settings-docs.h.in:210
msgid ""
"The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
"address."
@@ -7953,7 +8113,7 @@ msgstr ""
"トンネルのリモートエンドポイント。この値には、IPv4 アドレスまたは IPv6 アドレ"
"スを含める必要があります。"
-#: ../clients/common/settings-docs.c.in:207
+#: ../clients/common/settings-docs.h.in:211
msgid ""
"The type of service (IPv4) or traffic class (IPv6) field to be set on "
"tunneled packets."
@@ -7961,7 +8121,7 @@ msgstr ""
"トンネル化パケットに設定されるサービスのタイプ (IPv4) またはトラフィッククラ"
"ス (IPv6) フィールド。"
-#: ../clients/common/settings-docs.c.in:208
+#: ../clients/common/settings-docs.h.in:212
msgid ""
"The TTL to assign to tunneled packets. 0 is a special value meaning that "
"packets inherit the TTL value."
@@ -7969,28 +8129,29 @@ msgstr ""
"トンネル化パケットに割り当てる TTL。0 は特別な値で、パケットが TTL 値を継承す"
"ることを示しています。"
-#: ../clients/common/settings-docs.c.in:209
-#: ../clients/common/settings-docs.c.in:231
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
msgid "Array of IP addresses."
msgstr "IP アドレスの配列。"
-#: ../clients/common/settings-docs.c.in:210
-#: ../clients/common/settings-docs.c.in:232
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:236
msgid ""
"Timeout in milliseconds used to check for the presence of duplicate IP "
"addresses on the network. If an address conflict is detected, the "
"activation will fail. A zero value means that no duplicate address "
"detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or 3 seconds). A value greater than zero is a "
-"timeout in milliseconds."
+"ipvx.dad-timeout override or zero). A value greater than zero is a timeout "
+"in milliseconds. The property is currently implemented only for IPv4."
msgstr ""
"ネットワーク上で IP アドレスの重複を確認するのに使用されるタイムアウト (ミリ"
"秒単位)。アドレスの競合が検出されると、アクティベーションは失敗します。この値"
"をゼロにすると、重複アドレスの検出は行われません。-1 は、デフォルト値 (設定 "
-"ipvx.dad-timeout を上書きまたは 3 秒のいずれか) になります。値がゼロより大き"
-"い場合はタイムアウト (ミリ秒) になります。"
+"ipvx.dad-timeout を上書きまたはゼロのいずれか) になります。値がゼロより大きい"
+"場合はタイムアウト (ミリ秒) になります。現在、このプロパティーは IPv4 にのみ"
+"実装されています。"
-#: ../clients/common/settings-docs.c.in:211
+#: ../clients/common/settings-docs.h.in:215
msgid ""
"A string sent to the DHCP server to identify the local machine which the "
"DHCP server may use to customize the DHCP lease and options. When the "
@@ -7999,7 +8160,14 @@ msgid ""
"RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
"g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
"MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0."
+"hardware-address client ID and the 'type' field is set to 0. The special "
+"values \"mac\" and \"perm-mac\" are supported, which use the current or "
+"permanent MAC address of the device to generate a client identifier with "
+"type ethernet type (01). Currently, these options only work for ethernet "
+"type of links. The special value \"stable\" is supported to generate a type "
+"0 client identifier based on the stable-id (see connection.stable-id) and a "
+"per-host key. If unset, a globally configured default is used. If still "
+"unset, the client-id from the last lease is reused."
msgstr ""
"DHCP サーバーに送られる文字列。DHCP サーバーが DHCP リースとオプションをカス"
"タマイズするのに使用するローカルマシンを識別します。プロパティーが 16 進数 "
@@ -8008,9 +8176,16 @@ msgstr ""
"に、'type' フィールドとなり、残りのバイトはハードウェアアドレス ('01:xx:xx:"
"xx:xx:xx:xx' など。1 は Ethernet の ARP タイプで、残りは MAC アドレス) になり"
"ます。文字列が 16 進数ではない場合は、非ハードウェアアドレスのクライアント "
-"ID と見なされ、'type' フィールドは 0 に設定されます。"
+"ID と見なされ、'type' フィールドは 0 に設定されます。特別値である \"mac\" お"
+"よび \"perm-mac\" はサポートされています。これらは、デバイスの現在または永続"
+"的 MAC アドレスを使用して、type ethernet (01) でクライアント識別子を生成しま"
+"す。現在、これらのオプションは、ethernet リンクでのみ有効です。特別値 "
+"\"stable\" は、stable-id (connection.stable-id を参照) およびホストごとのキー"
+"を基に、type 0 のクライアント識別子を生成するようサポートされています。値が設"
+"定されない場合は、グローバルに設定されたデフォルトが使用されます。引き続き値"
+"が設定されない場合は、最後のリースのクライアント ID が再利用されます。"
-#: ../clients/common/settings-docs.c.in:212
+#: ../clients/common/settings-docs.h.in:216
msgid ""
"If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
"be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8020,8 +8195,8 @@ msgstr ""
"定した FQDN が DHCP サーバーに送られます。この優先度および \"dhcp-hostname\" "
"は相互に排他的で、同時に設定できません。"
-#: ../clients/common/settings-docs.c.in:213
-#: ../clients/common/settings-docs.c.in:233
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:238
msgid ""
"If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
"be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8031,8 +8206,8 @@ msgstr ""
"定した名前が DHCP サーバーに送られます。このプロパティーと \"dhcp-fqdn\" は相"
"互に排他的で、同時に設定できません。"
-#: ../clients/common/settings-docs.c.in:214
-#: ../clients/common/settings-docs.c.in:234
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:239
msgid ""
"If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
"DHCP servers use this hostname to update DNS databases, essentially "
@@ -8046,18 +8221,18 @@ msgstr ""
"NULL で、このプロパティーが TRUE の場合は、そのコンピューターの現在の永続ホス"
"ト名が送られます。"
-#: ../clients/common/settings-docs.c.in:215
-#: ../clients/common/settings-docs.c.in:235
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:240
msgid "A timeout for a DHCP transaction in seconds."
msgstr "DHCP トランザクションのタイムアウト (秒単位)。"
-#: ../clients/common/settings-docs.c.in:216
-#: ../clients/common/settings-docs.c.in:236
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:241
msgid "Array of IP addresses of DNS servers."
msgstr "DNS サーバーの IP アドレス配列。"
-#: ../clients/common/settings-docs.c.in:217
-#: ../clients/common/settings-docs.c.in:237
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:242
msgid ""
"Array of DNS options as described in man 5 resolv.conf. NULL means that the "
"options are unset and left at the default. In this case NetworkManager will "
@@ -8068,43 +8243,65 @@ msgstr ""
"NetworkManager はデフォルトのオプションを使用し、プロパティーのリストが空に"
"なっている場合とは区別されます。"
-#: ../clients/common/settings-docs.c.in:218
-#: ../clients/common/settings-docs.c.in:238
-msgid ""
-"Intra-connection DNS priority. The relative priority to be used when "
-"determining the order of DNS servers in resolv.conf. A lower value means "
-"that servers will be on top of the file. Zero selects the default value, "
-"which is 50 for VPNs and 100 for other connections. Note that the priority "
-"is to order DNS settings for multiple active connections. It does not "
-"disambiguate multiple DNS servers within the same connection profile. For "
-"that, just specify the DNS servers in the desired order. When multiple "
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:243
+msgid ""
+"DNS servers priority. The relative priority for DNS servers specified by "
+"this setting. A lower value is better (higher priority). Zero selects the "
+"default value, which is 50 for VPNs and 100 for other connections. Note that "
+"the priority is to order DNS settings for multiple active connections. It "
+"does not disambiguate multiple DNS servers within the same connection "
+"profile. When using dns=default, servers with higher priority will be on top "
+"of resolv.conf. To prioritize a given server over another one within the "
+"same connection, just specify them in the desired order. When multiple "
"devices have configurations with the same priority, the one with an active "
-"default route will be preferred. Note that when using dns=dnsmasq the order "
-"is meaningless since dnsmasq forwards queries to all known servers at the "
-"same time. Negative values have the special effect of excluding other "
-"configurations with a greater priority value; so in presence of at least a "
-"negative priority, only DNS servers from connections with the lowest "
-"priority value will be used."
-msgstr ""
-"内部接続の DNS 優先度。resolv.conf で DNS サーバーの順番を決定する際に使用さ"
-"れる関連優先度。値を低くすると、サーバーはファイルの上部に置かれます。ゼロは"
-"デフォルト値 (VPN の場合は 50、その他の接続の場合は 100) を選択します。優先度"
-"は、複数のアクティブな接続に対して DNS 設定の順番を設定しますが、同じ接続プロ"
-"ファイルにある複数の DNS サーバーの曖昧さは解消されません。これを解消するに"
-"は、DNS サーバーの順番を指定します。複数のデバイスで優先度が同じものがある場"
-"合は、アクティブなデフォルトルートを持つものが優先されます。ただし、"
-"dns=dnsmasq を使用している場合は順番を付けても意味がありません。dnsmasq は、"
-"既知のすべてのサーバーへのクエリーを同時に転送するためです。負の値は、より大"
-"きな優先度を持つその他の設定を除外します。したがって、優先度が負の場合は、一"
-"番低い優先度が設定されている接続の DNS サーバーだけが使用されます。"
-
-#: ../clients/common/settings-docs.c.in:219
-#: ../clients/common/settings-docs.c.in:239
-msgid "Array of DNS search domains."
-msgstr "DNS 検索ドメインの配列。"
-
-#: ../clients/common/settings-docs.c.in:220
-#: ../clients/common/settings-docs.c.in:240
+"default route will be preferred. Negative values have the special effect of "
+"excluding other configurations with a greater priority value; so in presence "
+"of at least a negative priority, only DNS servers from connections with the "
+"lowest priority value will be used. When using a DNS resolver that supports "
+"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
+"query domains in its search list. Queries for domains not present in any "
+"search list are routed through connections having the '~.' special wildcard "
+"domain, which is added automatically to connections with the default route "
+"(or can be added manually). When multiple connections specify the same "
+"domain, the one with the highest priority (lowest numerical value) wins. If "
+"a connection specifies a domain which is subdomain of another domain with a "
+"negative DNS priority value, the subdomain is ignored."
+msgstr ""
+"DNS サーバー優先度。この設定により指定された DNS サーバーの関連優先度。値が低"
+"い方が良い (優先度が高い) です。ゼロはデフォルト値 (VPN の場合は 50、その他の"
+"接続の場合は 100) を選択します。優先度は、複数のアクティブな接続に対して DNS "
+"設定の順番を設定しますが、同じ接続プロファイルにある複数の DNS サーバーの曖昧"
+"さは解消されません。dns=default を使用する場合、優先度の高いサーバーは "
+"resolv.conf の上に置かれます。同じ接続内で、特定のサーバーを別のサーバーより"
+"も優先したい場合は、優先順位を指定します。複数のデバイスで優先度が同じものが"
+"ある場合は、アクティブなデフォルトルートを持つものが優先されます。負の値は、"
+"より大きな優先度を持つその他の設定を除外します。したがって、優先度が負の場合"
+"は、一番低い優先度が設定されている接続の DNS サーバーだけが使用されます。"
+"dns=dnsmasq または dns=systemd-resolved として split-DNS をサポートする DNS "
+"リゾルバーを使用する際、各接続を使用して、検索リストのドメインをクエリーしま"
+"す。検索リストにないドメインのクエリーは、特別なワイルドカードドメインである "
+"'~.' を保持する接続でルーティングされます。'~.' は、デフォルトのルートで接続"
+"に自動的に追加されます (または手動での追加も可能です)。複数の接続が同じドメイ"
+"ンを指定した場合、優先度が最も高い接続 (数値が最も低い接続) が選ばれます。接"
+"続がドメインを指定し、そのドメインが、DNS の優先度の値が負である別のドメイン"
+"のサブドメインである場合、そのサブドメインは無視されます。"
+
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:244
+msgid ""
+"Array of DNS search domains. Domains starting with a tilde ('~') are "
+"considered 'routing' domains and are used only to decide the interface over "
+"which a query must be forwarded; they are not used to complete unqualified "
+"host names."
+msgstr ""
+"DNS 検索ドメインの配列。チルダ ('~') で始まるドメインは、ドメインを "
+"'routing' していると考えられ、どのインターフェースにクエリーを転送すべきかを"
+"決める際にのみ使用されます。これらは、非修飾ホスト名を完成させるためには使用"
+"されません。"
+
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:245
msgid ""
"The gateway associated with this configuration. This is only meaningful if "
"\"addresses\" is also set."
@@ -8112,8 +8309,8 @@ msgstr ""
"ゲートウェイは、この設定に関連付けられています。\"アドレス\" とともに設定した"
"場合に限り有効になります。"
-#: ../clients/common/settings-docs.c.in:221
-#: ../clients/common/settings-docs.c.in:241
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:246
msgid ""
"When \"method\" is set to \"auto\" and this property to TRUE, automatically "
"configured nameservers and search domains are ignored and only nameservers "
@@ -8125,8 +8322,8 @@ msgstr ""
"と \"dns-search\" プロパティーに指定したネームサーバーと検索ドメインだけが使"
"用されます。"
-#: ../clients/common/settings-docs.c.in:222
-#: ../clients/common/settings-docs.c.in:242
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:247
msgid ""
"When \"method\" is set to \"auto\" and this property to TRUE, automatically "
"configured routes are ignored and only routes specified in the \"routes\" "
@@ -8136,8 +8333,8 @@ msgstr ""
"に設定したルートは無視され、ルートを \"routes\" プロパティーに指定した場合"
"は、そのルートだけが使用されます。"
-#: ../clients/common/settings-docs.c.in:223
-#: ../clients/common/settings-docs.c.in:244
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:249
msgid ""
"If TRUE, allow overall network configuration to proceed even if the "
"configuration specified by this property times out. Note that at least one "
@@ -8152,8 +8349,8 @@ msgstr ""
"おいて、NMSettingIP4Config でこのプロパティーを TRUE に設定すると、IPv4 設定"
"が失敗し、IPv6 設定が完全に成功しても、全体のネットワーク設定が成功します。"
-#: ../clients/common/settings-docs.c.in:224
-#: ../clients/common/settings-docs.c.in:245
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
msgid ""
"IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
"support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8177,8 +8374,8 @@ msgstr ""
"定して IP サブセットを設定できます。設定しない場合は 10.42.x.0/24 が選択され"
"ます。"
-#: ../clients/common/settings-docs.c.in:226
-#: ../clients/common/settings-docs.c.in:247
+#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:252
msgid ""
"If TRUE, this connection will never be the default connection for this IP "
"type, meaning it will never be assigned the default route by NetworkManager."
@@ -8186,8 +8383,8 @@ msgstr ""
"TRUE にすると、この接続はこの IP タイプに対するデフォルトの接続にはならないた"
"め、NetworkManager によってデフォルトルートに割り当てられません。"
-#: ../clients/common/settings-docs.c.in:227
-#: ../clients/common/settings-docs.c.in:248
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:253
msgid ""
"The default metric for routes that don't explicitly specify a metric. The "
"default value -1 means that the metric is chosen automatically based on the "
@@ -8205,8 +8402,8 @@ msgstr ""
"ティーをゼロに設定すると、実際には 1024 になることに注意してください。IPv4 で"
"は、ゼロはメトリックの正則値となります。"
-#: ../clients/common/settings-docs.c.in:228
-#: ../clients/common/settings-docs.c.in:249
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:254
msgid ""
"Enable policy routing (source routing) and set the routing table used when "
"adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8236,12 +8433,12 @@ msgstr ""
"NetworkManager 以外のルーティングテーブルを管理するための後方互換性を確保しま"
"す。"
-#: ../clients/common/settings-docs.c.in:229
-#: ../clients/common/settings-docs.c.in:250
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:255
msgid "Array of IP routes."
msgstr "IP ルートの配列。"
-#: ../clients/common/settings-docs.c.in:230
+#: ../clients/common/settings-docs.h.in:234
msgid ""
"Configure method for creating the address for use with RFC4862 IPv6 "
"Stateless Address Autoconfiguration. The permitted values are: "
@@ -8265,7 +8462,7 @@ msgstr ""
"RFC4862 IPv6 ステートレスアドレスの自動設定で使用するアドレスを作成する方法を"
"設定します。利用できる値は NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) また"
"は NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1) です。このプロパ"
-"ティーを EUI64 に設定すると、アドレスは、ハードウェアアドレスから算出したイン"
+"ティーを EUI64 に設定すると、アドレスは、ハードウェアアドレスから取得したイン"
"ターフェーストークンを使用して生成されます。これにより、アドレスのホスト部分"
"は一定となり、ネットワークを変更する際にホストの存在を追跡できます。インター"
"フェースのハードウェアを交換するとアドレスは変更します。stable-privacy の値"
@@ -8279,7 +8476,56 @@ msgstr ""
"は、\"ip6-privacy\" プロパティーにより設定されたプライバシー拡張とは異なり、"
"このオプションで設定した一時アドレスには影響しないことに注意してください。"
-#: ../clients/common/settings-docs.c.in:243
+#: ../clients/common/settings-docs.h.in:237
+msgid ""
+"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
+"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
+"in the Client Identifier option. If the property is a hex string ('aa:bb:"
+"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
+"Client Identifier option. The special value \"lease\" will retrieve the DUID "
+"previously used from the lease file belonging to the connection. If no DUID "
+"is found and \"dhclient\" is the configured dhcp client, the DUID is "
+"searched in the system-wide dhclient lease file. If still no DUID is found, "
+"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
+"will be generated based on the machine-id. The special values \"llt\" and "
+"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
+"current MAC address of the device. In order to try providing a stable DUID-"
+"LLT, the time field will contain a constant timestamp that is used globally "
+"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
+"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
+"type, derived from the connection's stable-id and a per-host unique key. So, "
+"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
+"generated address derived from the stable id. The DUID-LLT time value in the "
+"\"stable-llt\" option will be picked among a static timespan of three years "
+"(the upper bound of the interval is the same constant timestamp used in \"llt"
+"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
+"duid\" is used. If no global value is provided, the default \"lease\" value "
+"is assumed."
+msgstr ""
+"DHCP クライアントが、DHCPv6 サーバー (RFC 3315) に識別してもらうために使用す"
+"る DHCPv6 一意識別子 (DUID) を含む文字列。DUID は、クライアント識別子のオプ"
+"ションにあります。プロパティーが 16 進数 ('aa:bb:cc') の場合は、バイナリーの "
+"DUID として解釈され、クライアント識別子のオプションに不透明な値として記入され"
+"ます。特別値の \"lease\" は、接続のリースファイルから以前使用した DUID を取得"
+"します。DUID が見つからず、\"dhclient\" が設定された DHCP クライアントの場"
+"合、システム全体の dhclient リースファイル内で DUID を検索します。引き続き "
+"DUID が見つからない場合、または別の DHCP クライアントが使用されている場合は、"
+"グローバルかつ永続的な DUID-UUID (RFC 6355) が machine-id に基づいて生成され"
+"ます。特別値の \"llt\" および \"ll\" は、デバイスの現在の MAC アドレスに基づ"
+"いて、LLT または LL (RFC 3315 を参照) タイプの DUID を生成します。安定した "
+"DUID-LLT を提供するために、タイムフィールドには、(すべてのプロファイル向け"
+"に) グローバルに使用され、ディスクに永続する一定のタイムスタンプが含まれま"
+"す。特別値の \"stable-llt\"、\"stable-ll\"、および \"stable-uuid\" は、対応す"
+"るタイプの DUID を生成します。これは、接続の stable-id およびホストごとの固有"
+"のキーから取得したものです。したがって、\"stable-ll\" および \"stable-llt\" "
+"のリンク層のアドレスは、stable id から算出される生成されたアドレスになりま"
+"す。\"stable-llt\" オプションの DUID-LLT タイム値は、3 年という静的タイムスパ"
+"ンの中から選ばれます (インターバルの上限は、\"llt\" で使用される一定のタイム"
+"スタンプと同じです)。プロパティーが設定されていない場合、\"ipv6.dhcp-duid\" "
+"に提供されるグローバル値が使用されます。グローバル値が提供されない場合は、デ"
+"フォルトの \"lease\" 値が想定されます。 "
+
+#: ../clients/common/settings-docs.h.in:248
msgid ""
"Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
"enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8308,7 +8554,7 @@ msgstr ""
"ロパティーの \"stable-privacy\" 設定で有効にできる、安定したプライバシーアド"
"レスとは区別されます。"
-#: ../clients/common/settings-docs.c.in:251
+#: ../clients/common/settings-docs.h.in:256
msgid ""
"Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
"tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -8316,33 +8562,33 @@ msgstr ""
"IPv6 トークン化したインターフェース識別子 draft-chown-6man-tokenised-ipv6-"
"identifiers-02 にトークンを設定します。eui64 addr-gen-mode で行うと便利です。"
-#: ../clients/common/settings-docs.c.in:252
+#: ../clients/common/settings-docs.h.in:257
msgid "Whether the transmitted traffic must be encrypted."
msgstr "転送トラフィックの暗号化が必要かどうか。"
-#: ../clients/common/settings-docs.c.in:253
+#: ../clients/common/settings-docs.h.in:258
msgid ""
"The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
msgstr "MACsec キー一致における共有前の CAK (接続関連キー)。"
-#: ../clients/common/settings-docs.c.in:254
+#: ../clients/common/settings-docs.h.in:259
msgid "Flags indicating how to handle the \"mka-cak\" property."
msgstr "\"mka-cak\" プロパティーの処理方法を示すフラグ。"
-#: ../clients/common/settings-docs.c.in:255
+#: ../clients/common/settings-docs.h.in:260
msgid ""
"The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
"Agreement."
msgstr "MACsec キー一致における共有前の CKN (接続に関連するキー名)。"
-#: ../clients/common/settings-docs.c.in:256
+#: ../clients/common/settings-docs.h.in:261
msgid ""
"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
"Agreement) is obtained."
msgstr ""
"MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。"
-#: ../clients/common/settings-docs.c.in:258
+#: ../clients/common/settings-docs.h.in:263
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this MACSEC interface should be created. If this property is not "
@@ -8354,17 +8600,25 @@ msgstr ""
"には、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含め"
"る必要があります。"
-#: ../clients/common/settings-docs.c.in:259
+#: ../clients/common/settings-docs.h.in:264
msgid ""
"The port component of the SCI (Secure Channel Identifier), between 1 and "
"65534."
msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント (1 - 65534)。"
-#: ../clients/common/settings-docs.c.in:260
+#: ../clients/common/settings-docs.h.in:265
+msgid ""
+"Specifies whether the SCI (Secure Channel Identifier) is included in every "
+"packet."
+msgstr ""
+"パケットごとに SCI (セキュアチャネル識別子) が含まれているかどうかを指定しま"
+"す。"
+
+#: ../clients/common/settings-docs.h.in:266
msgid "Specifies the validation mode for incoming frames."
msgstr "入力フレームの検証モードを指定します。"
-#: ../clients/common/settings-docs.c.in:261
+#: ../clients/common/settings-docs.h.in:267
msgid ""
"The macvlan mode, which specifies the communication mechanism between "
"multiple macvlans on the same lower device."
@@ -8372,7 +8626,7 @@ msgstr ""
"同じ低いデバイスで、複数の macvlans 間で通信メカニズムを指定する macvlan モー"
"ド。"
-#: ../clients/common/settings-docs.c.in:263
+#: ../clients/common/settings-docs.h.in:269
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this MAC-VLAN interface should be created. If this property is not "
@@ -8384,71 +8638,70 @@ msgstr ""
"に、\"mac-address\" プロパティーが追加された \"802-3-ethernet\" 設定を含める"
"必要があります。"
-#: ../clients/common/settings-docs.c.in:264
+#: ../clients/common/settings-docs.h.in:270
msgid "Whether the interface should be put in promiscuous mode."
msgstr "インターフェースをプロミスキャスモードにするべきかどうか。"
-#: ../clients/common/settings-docs.c.in:265
+#: ../clients/common/settings-docs.h.in:271
msgid "Whether the interface should be a MACVTAP."
msgstr "インターフェースが MACVTAP にすべきかどうか。"
-#: ../clients/common/settings-docs.c.in:266
+#: ../clients/common/settings-docs.h.in:272
msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
msgstr "ブリッジの失敗モード。\"secure\"、\"standalone\"、また空のいずれか。"
-#: ../clients/common/settings-docs.c.in:267
+#: ../clients/common/settings-docs.h.in:273
msgid "Enable or disable multicast snooping."
msgstr "マルチキャストのスヌーピングを有効化または無効化にします。"
-#: ../clients/common/settings-docs.c.in:269
+#: ../clients/common/settings-docs.h.in:275
msgid "Enable or disable RSTP."
msgstr "RSTP を有効化または無効化にします。"
-#: ../clients/common/settings-docs.c.in:270
+#: ../clients/common/settings-docs.h.in:276
msgid "Enable or disable STP."
msgstr "STP を有効化または無効化にします。"
-#: ../clients/common/settings-docs.c.in:272
+#: ../clients/common/settings-docs.h.in:278
msgid "The interface type. Either \"internal\", or empty."
msgstr "インターフェースのタイプ。\"internal\" または空のいずれかになります。"
-#: ../clients/common/settings-docs.c.in:274
+#: ../clients/common/settings-docs.h.in:280
msgid ""
-"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
+"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
"port to connect to."
msgstr ""
-"接続するリモートの OpenVSwitch ブリッジポートのユニキャスト宛先 IP アドレス"
+"接続するリモートの Open vSwitch ブリッジポートのユニキャスト宛先 IP アドレス"
"を指定します。"
-#: ../clients/common/settings-docs.c.in:275
+#: ../clients/common/settings-docs.h.in:281
msgid "The time port must be inactive in order to be considered down."
msgstr ""
"ダウンしたと見なすためには、タイムポートを非アクティブにする必要があります。"
-#: ../clients/common/settings-docs.c.in:276
+#: ../clients/common/settings-docs.h.in:282
msgid ""
"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
msgstr ""
"ボンディングモード。\"active-backup\"、\"balance-slb\"、または \"balance-tcp"
"\" のいずれかになります。"
-#: ../clients/common/settings-docs.c.in:277
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:283
msgid "The time port must be active before it starts forwarding traffic."
msgstr ""
-"トラフィックの転送を開始する前は、タイムポートをアクティブにする必要がありま"
+"トラフィックの転送を始める前に、タイムポートをアクティブにする必要がありま"
"す。"
-#: ../clients/common/settings-docs.c.in:278
+#: ../clients/common/settings-docs.h.in:284
msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
msgstr ""
"LACP モード。\"active\"、\"off\"、または \"passive\" のいずれかになります。"
-#: ../clients/common/settings-docs.c.in:280
+#: ../clients/common/settings-docs.h.in:286
msgid "The VLAN tag in the range 0-4095."
msgstr "VLAN タグは 0 - 4095 の範囲内にあります。"
-#: ../clients/common/settings-docs.c.in:281
+#: ../clients/common/settings-docs.h.in:287
msgid ""
"The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
"\"trunk\" or unset."
@@ -8456,7 +8709,7 @@ msgstr ""
"VLAN モード。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" の"
"いずれかに設定するか、何も設定しません。"
-#: ../clients/common/settings-docs.c.in:282
+#: ../clients/common/settings-docs.h.in:288
msgid ""
"If non-zero, instruct pppd to set the serial port to the specified "
"baudrate. This value should normally be left as 0 to automatically choose "
@@ -8465,7 +8718,7 @@ msgstr ""
"ゼロ以外は、pppd より指定したボーレートにシリアルポートを設定します。速度が自"
"動的に選択されるように、通常は、この値を 0 にします。"
-#: ../clients/common/settings-docs.c.in:283
+#: ../clients/common/settings-docs.h.in:289
msgid ""
"If TRUE, specify that pppd should set the serial port to use hardware flow "
"control with RTS and CTS signals. This value should normally be set to "
@@ -8475,7 +8728,7 @@ msgstr ""
"フロー制御を使用するシリアルポートを設定する必要があります。この値は、通常は "
"FALSE に設定する必要があります。"
-#: ../clients/common/settings-docs.c.in:284
+#: ../clients/common/settings-docs.h.in:290
msgid ""
"If non-zero, instruct pppd to presume the connection to the peer has failed "
"if the specified number of LCP echo-requests go unanswered by the peer. The "
@@ -8487,7 +8740,7 @@ msgstr ""
"場合は、\"lcp-echo-interval\" プロパティーもゼロ以外の値に設定する必要があり"
"ます。"
-#: ../clients/common/settings-docs.c.in:285
+#: ../clients/common/settings-docs.h.in:291
msgid ""
"If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
"every n seconds (where n is the specified value). Note that some PPP peers "
@@ -8495,10 +8748,10 @@ msgid ""
"autodetect this."
msgstr ""
"ゼロ以外にすると、pppd が、n 秒ごとにピアに LCP echo-request フレームを送るよ"
-"うに なります (n は指定した値)。PPP ピアの一部だけがエコー要求に応答します。"
-"これを自動検出することはできません。"
+"うになります (n は指定した値)。PPP ピアの一部だけがエコー要求に応答します。こ"
+"れを自動検出することはできません。"
-#: ../clients/common/settings-docs.c.in:286
+#: ../clients/common/settings-docs.h.in:292
msgid ""
"If TRUE, stateful MPPE is used. See pppd documentation for more information "
"on stateful MPPE."
@@ -8506,7 +8759,7 @@ msgstr ""
"TRUE の場合は、ステートフル MPPE が使用されます。ステートフル MPPE の詳細は "
"pppd ドキュメントを参照してください。"
-#: ../clients/common/settings-docs.c.in:287
+#: ../clients/common/settings-docs.h.in:293
msgid ""
"If non-zero, instruct pppd to request that the peer send packets no larger "
"than the specified size. If non-zero, the MRU should be between 128 and "
@@ -8515,16 +8768,16 @@ msgstr ""
"ゼロ以外は、指定したサイズ以下のパケットをピアが送信するように pppd が要求し"
"ます。ゼロ以外では、MRU は 128 から 16384 の間にする必要があります。"
-#: ../clients/common/settings-docs.c.in:288
+#: ../clients/common/settings-docs.h.in:294
msgid ""
"If non-zero, instruct pppd to send packets no larger than the specified size."
msgstr "ゼロ以外は、pppd により、指定したサイズ以下のパケットが送信されます。"
-#: ../clients/common/settings-docs.c.in:290
+#: ../clients/common/settings-docs.h.in:296
msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
msgstr "TRUE の場合は、Van Jacobsen TCP ヘッダー圧縮が要求されません。"
-#: ../clients/common/settings-docs.c.in:291
+#: ../clients/common/settings-docs.h.in:297
msgid ""
"If TRUE, do not require the other side (usually the PPP server) to "
"authenticate itself to the client. If FALSE, require authentication from "
@@ -8534,35 +8787,35 @@ msgstr ""
"されません。FALSE の場合は、リモート側からの認証が必要になります。ほとんどす"
"べての場合で、これは TRUE にする必要があります。"
-#: ../clients/common/settings-docs.c.in:292
+#: ../clients/common/settings-docs.h.in:298
msgid "If TRUE, BSD compression will not be requested."
msgstr "TRUE の場合は、BSD 圧縮が要求されません。"
-#: ../clients/common/settings-docs.c.in:293
+#: ../clients/common/settings-docs.h.in:299
msgid "If TRUE, \"deflate\" compression will not be requested."
msgstr "TRUE の場合は、\"deflate\" 圧縮が要求されません。"
-#: ../clients/common/settings-docs.c.in:294
+#: ../clients/common/settings-docs.h.in:300
msgid "If TRUE, the CHAP authentication method will not be used."
msgstr "TRUE の場合は、CHAP 認証方法が使用されません。"
-#: ../clients/common/settings-docs.c.in:295
+#: ../clients/common/settings-docs.h.in:301
msgid "If TRUE, the EAP authentication method will not be used."
msgstr "TRUE の場合は、EAP 認証方法が使用されません。"
-#: ../clients/common/settings-docs.c.in:296
+#: ../clients/common/settings-docs.h.in:302
msgid "If TRUE, the MSCHAP authentication method will not be used."
msgstr "TRUE の場合は、MSCHAP 認証方法が使用されません。"
-#: ../clients/common/settings-docs.c.in:297
+#: ../clients/common/settings-docs.h.in:303
msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
msgstr "TRUE の場合は、MSCHAPv2 認証方法が使用されません。"
-#: ../clients/common/settings-docs.c.in:298
+#: ../clients/common/settings-docs.h.in:304
msgid "If TRUE, the PAP authentication method will not be used."
msgstr "TRUE の場合は、PAP 認証方法が使用されません。"
-#: ../clients/common/settings-docs.c.in:299
+#: ../clients/common/settings-docs.h.in:305
msgid ""
"If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
"PPP session. If either 64-bit or 128-bit MPPE is not available the session "
@@ -8573,7 +8826,7 @@ msgstr ""
"なると、セッションは失敗します。MPPE がモバイルブロードバンド接続に使用されな"
"い点に注意してください。"
-#: ../clients/common/settings-docs.c.in:300
+#: ../clients/common/settings-docs.h.in:306
msgid ""
"If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
"for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -8584,7 +8837,7 @@ msgstr ""
"定する必要があります。128 ビットの MPPE が利用できないと、セッションは失敗し"
"ます。"
-#: ../clients/common/settings-docs.c.in:302
+#: ../clients/common/settings-docs.h.in:308
msgid ""
"If given, specifies the parent interface name on which this PPPoE connection "
"should be created. If this property is not specified, the connection is "
@@ -8595,11 +8848,11 @@ msgstr ""
"このプロパティーを指定しないと、この接続は、NMSettingConnection の "
"\"interface-name\" に指定したインターフェースで接続が有効になります。"
-#: ../clients/common/settings-docs.c.in:303
+#: ../clients/common/settings-docs.h.in:309
msgid "Password used to authenticate with the PPPoE service."
msgstr "PPPoE サービスでの認証に使用するパスワード。"
-#: ../clients/common/settings-docs.c.in:305
+#: ../clients/common/settings-docs.h.in:311
msgid ""
"If specified, instruct PPPoE to only initiate sessions with access "
"concentrators that provide the specified service. For most providers, this "
@@ -8611,29 +8864,29 @@ msgstr ""
"定を空白のままにする必要があります。これは、アクセス集線装置が複数ある場合"
"や、特別なサービスが必要であることが分かっている場合に限り必要になります。"
-#: ../clients/common/settings-docs.c.in:306
+#: ../clients/common/settings-docs.h.in:312
msgid "Username used to authenticate with the PPPoE service."
msgstr "PPPoE サービスでの認証に使用するユーザー名。"
-#: ../clients/common/settings-docs.c.in:307
+#: ../clients/common/settings-docs.h.in:313
msgid "Whether the proxy configuration is for browser only."
msgstr "プロキシー設定がブラウザー専用であるかどうか。"
-#: ../clients/common/settings-docs.c.in:308
+#: ../clients/common/settings-docs.h.in:314
msgid ""
"Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
msgstr ""
"プロキシー設定の方法。デフォルトは NM_SETTING_PROXY_METHOD_NONE (0) です。"
-#: ../clients/common/settings-docs.c.in:310
+#: ../clients/common/settings-docs.h.in:316
msgid "PAC script for the connection."
msgstr "接続の PAC スクリプト。"
-#: ../clients/common/settings-docs.c.in:311
+#: ../clients/common/settings-docs.h.in:317
msgid "PAC URL for obtaining PAC file."
msgstr "PAC ファイルを取得する PAC URL"
-#: ../clients/common/settings-docs.c.in:312
+#: ../clients/common/settings-docs.h.in:318
msgid ""
"Speed to use for communication over the serial port. Note that this value "
"usually has no effect for mobile broadband modems as they generally ignore "
@@ -8643,19 +8896,19 @@ msgstr ""
"ドモデムには影響しません。通常は速度設定を無視し、利用可能な最高の速度を使用"
"します。"
-#: ../clients/common/settings-docs.c.in:313
+#: ../clients/common/settings-docs.h.in:319
msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
msgstr "シリアル接続のバイト幅。たとえば、\"8n1\" の 8 です。"
-#: ../clients/common/settings-docs.c.in:315
+#: ../clients/common/settings-docs.h.in:321
msgid "Parity setting of the serial port."
msgstr "シリアルポートのパリティ設定。"
-#: ../clients/common/settings-docs.c.in:316
+#: ../clients/common/settings-docs.h.in:322
msgid "Time to delay between each byte sent to the modem, in microseconds."
msgstr "モデムに送信したバイト間の遅延時間 (マイクロ秒単位)。"
-#: ../clients/common/settings-docs.c.in:317
+#: ../clients/common/settings-docs.h.in:323
msgid ""
"Number of stop bits for communication on the serial port. Either 1 or 2. "
"The 1 in \"8n1\" for example."
@@ -8663,16 +8916,15 @@ msgstr ""
"シリアルポートで通信するための停止ビットの数。1 または 2 のいずれかになりま"
"す。たとえば、\"8n1\" の 1 です。"
-#: ../clients/common/settings-docs.c.in:319
+#: ../clients/common/settings-docs.h.in:325
msgid "Array of TC queuening disciplines."
-msgstr ""
+msgstr "TC キュー処理の配列"
-#: ../clients/common/settings-docs.c.in:320
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:326
msgid "Array of TC traffic filters."
-msgstr "IP ルートの配列。"
+msgstr "TC トラフィックフィルターの配列"
-#: ../clients/common/settings-docs.c.in:321
+#: ../clients/common/settings-docs.h.in:327
msgid ""
"The JSON configuration for the team network interface. The property should "
"contain raw JSON configuration data suitable for teamd, because the value is "
@@ -8684,8 +8936,8 @@ msgstr ""
"指定しないと、デフォルトの設定が使用されます。フォーマットの詳細は、man "
"teamd.conf を参照してください。"
-#: ../clients/common/settings-docs.c.in:322
-#: ../clients/common/settings-docs.c.in:341
+#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:347
msgid ""
"Link watchers configuration for the connection: each link watcher is defined "
"by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8696,66 +8948,82 @@ msgid ""
"'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
"for more details."
msgstr ""
+"接続のリンクウォッチャー設定: リンクウォッチャーはそれぞれディクショナリーに"
+"よって定義され、キーは選択したリンクウォッチャーによって異なります。利用でき"
+"るリンクウォッチャーは 'ethtool'、'nsna_ping'、'arp_ping' に加え、キーの "
+"'name' でディクショナリーに指定したものになります。利用できるキー: ethtool で"
+"は 'delay-up'、'delay-down'、'init-wait'。nsna_ping では 'init-"
+"wait'、'interval'、'missed-max'、'target-host'。arp_ping では、nsna_ping の全"
+"キーおよび 'source-host'、'validate-active'、'validate-incative'、'send-"
+"always'。詳細は teamd.conf の man ページを参照してください。"
-#: ../clients/common/settings-docs.c.in:323
+#: ../clients/common/settings-docs.h.in:329
msgid "Corresponds to the teamd mcast_rejoin.count."
-msgstr ""
+msgstr "teamd mcast_rejoin.count に相当します。"
-#: ../clients/common/settings-docs.c.in:324
+#: ../clients/common/settings-docs.h.in:330
msgid "Corresponds to the teamd mcast_rejoin.interval."
-msgstr ""
+msgstr "teamd mcast_rejoin.interval に相当します。"
-#: ../clients/common/settings-docs.c.in:326
+#: ../clients/common/settings-docs.h.in:332
msgid "Corresponds to the teamd notify_peers.count."
-msgstr ""
+msgstr "teamd notify_peers.count に相当します。"
-#: ../clients/common/settings-docs.c.in:327
+#: ../clients/common/settings-docs.h.in:333
msgid "Corresponds to the teamd notify_peers.interval."
-msgstr ""
+msgstr "teamd notify_peers.interval に相当します。"
-#: ../clients/common/settings-docs.c.in:328
+#: ../clients/common/settings-docs.h.in:334
msgid ""
"Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:329
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
+"setting the runner, all the properties specific to the runner will be reset "
+"to the default value; all the properties specific to other runners will be "
+"set to an empty value (or if not possible to a default value)."
+msgstr ""
+"teamd runner.name に相当します。可能な値: \"roundrobin\"、\"broadcast"
+"\"、\"activebackup\"、\"loadbalance\"、\"lacp\"、\"random\"。ランナーを設定す"
+"る際、このランナー特有のすべてのプロパティーは、デフォルト値にリセットされま"
+"す。他のランナー特有のプロパティーはすべて、空の値に設定されます (または、デ"
+"フォルト値に設定されない場合は空の値に設定されます)。"
+
+#: ../clients/common/settings-docs.h.in:335
msgid "Corresponds to the teamd runner.active."
-msgstr ""
+msgstr "teamd runner.active に相当します。"
-#: ../clients/common/settings-docs.c.in:330
+#: ../clients/common/settings-docs.h.in:336
msgid "Corresponds to the teamd runner.agg_select_policy."
-msgstr ""
+msgstr "teamd runner.agg_select_policy に相当します"
-#: ../clients/common/settings-docs.c.in:331
+#: ../clients/common/settings-docs.h.in:337
msgid "Corresponds to the teamd runner.fast_rate."
-msgstr ""
+msgstr "teamd runner.fast_rate に相当します。"
-#: ../clients/common/settings-docs.c.in:332
+#: ../clients/common/settings-docs.h.in:338
msgid "Corresponds to the teamd runner.hwaddr_policy."
-msgstr ""
+msgstr "teamd runner.hwaddr_policy に相当します。"
-#: ../clients/common/settings-docs.c.in:333
+#: ../clients/common/settings-docs.h.in:339
msgid "Corresponds to the teamd runner.min_ports."
-msgstr ""
+msgstr "teamd runner.min_ports に相当します。"
-#: ../clients/common/settings-docs.c.in:334
+#: ../clients/common/settings-docs.h.in:340
msgid "Corresponds to the teamd runner.sys_prio."
-msgstr ""
+msgstr "teamd runner.sys_prio に相当します。"
-#: ../clients/common/settings-docs.c.in:335
+#: ../clients/common/settings-docs.h.in:341
msgid "Corresponds to the teamd runner.tx_balancer.name."
-msgstr ""
+msgstr "teamd runner.tx_balancer.name に相当します。"
-#: ../clients/common/settings-docs.c.in:336
+#: ../clients/common/settings-docs.h.in:342
msgid "Corresponds to the teamd runner.tx_balancer.interval."
-msgstr ""
+msgstr "teamd runner.tx_balancer.interval に相当します。"
-#: ../clients/common/settings-docs.c.in:337
+#: ../clients/common/settings-docs.h.in:343
msgid "Corresponds to the teamd runner.tx_hash."
-msgstr ""
+msgstr "teamd runner.tx_hash に相当します。"
-#: ../clients/common/settings-docs.c.in:338
+#: ../clients/common/settings-docs.h.in:344
msgid ""
"The JSON configuration for the team port. The property should contain raw "
"JSON configuration data suitable for teamd, because the value is passed "
@@ -8767,29 +9035,31 @@ msgstr ""
"は、デフォルト設定が使用されます。フォーマットの詳細は、man teamd.conf を参照"
"してください。"
-#: ../clients/common/settings-docs.c.in:339
+#: ../clients/common/settings-docs.h.in:345
msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.lacp_key に相当します。"
-#: ../clients/common/settings-docs.c.in:340
+#: ../clients/common/settings-docs.h.in:346
msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.lacp_prio に相当します。"
-#: ../clients/common/settings-docs.c.in:343
+#: ../clients/common/settings-docs.h.in:349
msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.prio に相当します。"
-#: ../clients/common/settings-docs.c.in:344
+#: ../clients/common/settings-docs.h.in:350
msgid ""
"Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
"parameter is skipped from the json config."
msgstr ""
+"teamd ports.PORTIFNAME.queue_id に相当します。-1 に設定すると、このパラメー"
+"ターは json 設定で無視されます。"
-#: ../clients/common/settings-docs.c.in:345
+#: ../clients/common/settings-docs.h.in:351
msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.sticky に相当します。"
-#: ../clients/common/settings-docs.c.in:346
+#: ../clients/common/settings-docs.h.in:352
msgid ""
"The group ID which will own the device. If set to NULL everyone will be able "
"to use the device."
@@ -8797,7 +9067,7 @@ msgstr ""
"デバイスを所有するグループ ID。NULL を設定すると、誰でもこのデバイスを使用で"
"きるようになります。"
-#: ../clients/common/settings-docs.c.in:347
+#: ../clients/common/settings-docs.h.in:353
msgid ""
"The operating mode of the virtual device. Allowed values are "
"NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -8807,7 +9077,7 @@ msgstr ""
"成する NM_SETTING_TUN_MODE_TUN (1) と、Ethernet のようなレイヤー 2 デバイスを"
"作成する NM_SETTING_TUN_MODE_TAP (2) です。"
-#: ../clients/common/settings-docs.c.in:348
+#: ../clients/common/settings-docs.h.in:354
msgid ""
"If the property is set to TRUE, the interface will support multiple file "
"descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -8817,7 +9087,7 @@ msgstr ""
"プター (キュー) を使用して、パケットの送受信を並行して処理します。TRUE に設定"
"しないと、インターフェースは 1 つのキューしかサポートしません。"
-#: ../clients/common/settings-docs.c.in:350
+#: ../clients/common/settings-docs.h.in:356
msgid ""
"The user ID which will own the device. If set to NULL everyone will be able "
"to use the device."
@@ -8825,7 +9095,7 @@ msgstr ""
"デバイスを所有するユーザー ID。NULL を設定すると、誰でもこのデバイスを使用で"
"きるようになります。"
-#: ../clients/common/settings-docs.c.in:351
+#: ../clients/common/settings-docs.h.in:357
msgid ""
"If TRUE the interface will prepend a 4 byte header describing the physical "
"interface to the packets."
@@ -8833,7 +9103,7 @@ msgstr ""
"TRUE の場合、インターフェースは、パケットの先頭に、物理インターフェースを接続"
"する 4 バイトのヘッダーを追加します。"
-#: ../clients/common/settings-docs.c.in:352
+#: ../clients/common/settings-docs.h.in:358
msgid ""
"If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
"header."
@@ -8841,7 +9111,7 @@ msgstr ""
"IFF_VNET_HDR を TRUE にすると、トンネルパケットには、virtio ネットワークヘッ"
"ダーが含まれます。"
-#: ../clients/common/settings-docs.c.in:353
+#: ../clients/common/settings-docs.h.in:359
msgid ""
"A dictionary of key/value pairs with user data. This data is ignored by "
"NetworkManager and can be used at the users discretion. The keys only "
@@ -8853,7 +9123,7 @@ msgstr ""
"ascii フォーマットのみをサポートしますが、値は、指定した長さまでの任意の "
"UTF8 文字列にできます。"
-#: ../clients/common/settings-docs.c.in:355
+#: ../clients/common/settings-docs.h.in:361
msgid ""
"For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
"priorities. The mapping is given in the format \"from:to\" where both \"from"
@@ -8863,7 +9133,7 @@ msgstr ""
"このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
"など、署名なし整数にします。"
-#: ../clients/common/settings-docs.c.in:356
+#: ../clients/common/settings-docs.h.in:362
msgid ""
"One or more flags which control the behavior and features of the VLAN "
"interface. Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -8882,9 +9152,9 @@ msgstr ""
"グ)、NM_VLAN_FLAG_MVRP (0x8) (MVRP プロトコルの使用) などがあります。このプロ"
"パティーのデフォルト値は NM_VLAN_FLAG_REORDER_HEADERS ですが、以前は 0 でし"
"た。後方互換性を確保するには D-Bus API のデフォルト値を 0 のままにし、D-Bus "
-"における不明なプロパティは引き続き 0 と見なされます。"
+"における不明なプロパティーは引き続き 0 と見なされます。"
-#: ../clients/common/settings-docs.c.in:357
+#: ../clients/common/settings-docs.h.in:363
msgid ""
"The VLAN identifier that the interface created by this connection should be "
"assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -8892,7 +9162,7 @@ msgstr ""
"この接続が作成するインターフェースを割り当てる必要がある VLAN 識別子。有効は"
"範囲は 0 - 4094 となり、予約されている id 4095 は除外されます。"
-#: ../clients/common/settings-docs.c.in:358
+#: ../clients/common/settings-docs.h.in:364
msgid ""
"For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
"priorities. The mapping is given in the format \"from:to\" where both \"from"
@@ -8902,7 +9172,7 @@ msgstr ""
"このマッピングは、\"from:to\" の形式で指定し、\"from\" と \"to\" は、\"7:3\" "
"など、署名なし整数にします。"
-#: ../clients/common/settings-docs.c.in:360
+#: ../clients/common/settings-docs.h.in:366
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this VLAN interface should be created. If this property is not "
@@ -8914,7 +9184,7 @@ msgstr ""
"に、\"mac-address\" プロパティーが指定されている \"802-3-ethernet\" 設定を含"
"める必要があります。"
-#: ../clients/common/settings-docs.c.in:361
+#: ../clients/common/settings-docs.h.in:367
msgid ""
"Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
"values must be strings."
@@ -8922,7 +9192,7 @@ msgstr ""
"VPN プラグイン特有のデータにおけるキーと値がペアになったディクショナリー。"
"キーと値の両方を文字列にする必要があります。"
-#: ../clients/common/settings-docs.c.in:363
+#: ../clients/common/settings-docs.h.in:369
msgid ""
"If the VPN service supports persistence, and this property is TRUE, the VPN "
"will attempt to stay connected across link changes and outages, until "
@@ -8932,7 +9202,7 @@ msgstr ""
"VPN は、明示的に切断されるまで、リンクが変更され、停止しても接続されたままに"
"なります。"
-#: ../clients/common/settings-docs.c.in:364
+#: ../clients/common/settings-docs.h.in:370
msgid ""
"Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
"or private keys. Both keys and values must be strings."
@@ -8940,7 +9210,7 @@ msgstr ""
"パスワードや秘密鍵など、VPN プラグイン特有のシークレットに関するキーと値のペ"
"アのディクショナリー。キーと値はともに文字列にする必要があります。"
-#: ../clients/common/settings-docs.c.in:365
+#: ../clients/common/settings-docs.h.in:371
msgid ""
"D-Bus service name of the VPN plugin that this setting uses to connect to "
"its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -8948,7 +9218,7 @@ msgstr ""
"この設定がネットワークに接続するのに使用する VPN プラグインの D-Bus サービス"
"名。vpnc プラグインの場合は org.freedesktop.NetworkManager.vpnc です。"
-#: ../clients/common/settings-docs.c.in:366
+#: ../clients/common/settings-docs.h.in:372
msgid ""
"Timeout for the VPN service to establish the connection. Some services may "
"take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -8956,11 +9226,11 @@ msgid ""
"Values greater than zero mean timeout in seconds."
msgstr ""
"VPN の接続確立に関するタイムアウト。一部のサービスでは接続に時間がかかる場合"
-"があります。値を 0 にすると、デフォルトのタイムアウト 60 秒となります (設定"
+"があります。値を 0 にすると、デフォルトのタイムアウトの 60 秒となります (設定"
"ファイルで vpn.timeout を上書きしていない場合)。ゼロ以外の値を設定した場合"
"は、それがタイムアウト (秒単位) となります。"
-#: ../clients/common/settings-docs.c.in:367
+#: ../clients/common/settings-docs.h.in:373
msgid ""
"If the VPN connection requires a user name for authentication, that name "
"should be provided here. If the connection is available to more than one "
@@ -8975,11 +9245,11 @@ msgstr ""
"すると、NetworkManager は、VPN 接続を要求するユーザーのユーザー名を自動的に提"
"供します。"
-#: ../clients/common/settings-docs.c.in:368
+#: ../clients/common/settings-docs.h.in:374
msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
msgstr "カーネルが学習する FDB エントリーの存続時間 (秒単位) を指定します。"
-#: ../clients/common/settings-docs.c.in:369
+#: ../clients/common/settings-docs.h.in:375
msgid ""
"Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
"endpoint."
@@ -8987,24 +9257,24 @@ msgstr ""
"リモートの VXLAN トンネルエンドポイントに接続する UDP 宛先ポートを指定しま"
"す。"
-#: ../clients/common/settings-docs.c.in:370
+#: ../clients/common/settings-docs.h.in:376
msgid ""
"Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
msgstr ""
"使用する VXLAN ネットワーク識別子 (または VXLAN セグメント識別子) を指定しま"
"す。"
-#: ../clients/common/settings-docs.c.in:371
+#: ../clients/common/settings-docs.h.in:377
msgid "Specifies whether netlink LL ADDR miss notifications are generated."
msgstr ""
"ネットリンク LL ADDR が欠落している通知が生成されるかどうかを指定します。"
-#: ../clients/common/settings-docs.c.in:372
+#: ../clients/common/settings-docs.h.in:378
msgid "Specifies whether netlink IP ADDR miss notifications are generated."
msgstr ""
"ネットリンク IP ADDR が欠落している通知が生成されるかどうかを指定します。"
-#: ../clients/common/settings-docs.c.in:373
+#: ../clients/common/settings-docs.h.in:379
msgid ""
"Specifies whether unknown source link layer addresses and IP addresses are "
"entered into the VXLAN device forwarding database."
@@ -9012,7 +9282,7 @@ msgstr ""
"未知のソースリンクレイヤーのアドレスと IP アドレスを、VXLAN デバイス転送デー"
"タベースに入力するかどうかを指定します。"
-#: ../clients/common/settings-docs.c.in:374
+#: ../clients/common/settings-docs.h.in:380
msgid ""
"Specifies the maximum number of FDB entries. A value of zero means that the "
"kernel will store unlimited entries."
@@ -9020,21 +9290,21 @@ msgstr ""
"FDB エントリーの最大数を指定します。値がゼロの場合は、カーネルがエントリーを"
"無限に保存することを意味します。"
-#: ../clients/common/settings-docs.c.in:375
+#: ../clients/common/settings-docs.h.in:381
msgid "If given, specifies the source IP address to use in outgoing packets."
msgstr ""
"指定した場合は、送信パケットで使用するソースの IP アドレスを指定します。"
-#: ../clients/common/settings-docs.c.in:377
+#: ../clients/common/settings-docs.h.in:383
msgid ""
"If given, specifies the parent interface name or parent connection UUID."
msgstr "指定した場合は、親インターフェース名または親接続の UUID を指定します。"
-#: ../clients/common/settings-docs.c.in:378
+#: ../clients/common/settings-docs.h.in:384
msgid "Specifies whether ARP proxy is turned on."
msgstr "ARP プロキシーをオンにするかどうかを指定します"
-#: ../clients/common/settings-docs.c.in:379
+#: ../clients/common/settings-docs.h.in:385
msgid ""
"Specifies the unicast destination IP address to use in outgoing packets when "
"the destination link layer address is not known in the VXLAN device "
@@ -9044,11 +9314,11 @@ msgstr ""
"パケットで使用するユニキャストの宛先 IP アドレス、または参加するマルチキャス"
"ト IP アドレスを指定します。"
-#: ../clients/common/settings-docs.c.in:380
+#: ../clients/common/settings-docs.h.in:386
msgid "Specifies whether route short circuit is turned on."
msgstr "ルートのショートサーキットがオンになっているかどうかを指定します。"
-#: ../clients/common/settings-docs.c.in:381
+#: ../clients/common/settings-docs.h.in:387
msgid ""
"Specifies the maximum UDP source port to communicate to the remote VXLAN "
"tunnel endpoint."
@@ -9056,7 +9326,7 @@ msgstr ""
"リモート VXLAN のトンネルエンドポイントに接続する最大 UDP ソースポートを指定"
"します。"
-#: ../clients/common/settings-docs.c.in:382
+#: ../clients/common/settings-docs.h.in:388
msgid ""
"Specifies the minimum UDP source port to communicate to the remote VXLAN "
"tunnel endpoint."
@@ -9064,15 +9334,15 @@ msgstr ""
"リモートの VXLAN トンネルエンドポイントに接続するための最小 UDP ソースポート"
"を指定します。"
-#: ../clients/common/settings-docs.c.in:383
+#: ../clients/common/settings-docs.h.in:389
msgid "Specifies the TOS value to use in outgoing packets."
msgstr "送信パケットで使用する TOS 値を指定します。"
-#: ../clients/common/settings-docs.c.in:384
+#: ../clients/common/settings-docs.h.in:390
msgid "Specifies the time-to-live value to use in outgoing packets."
msgstr "送信パケットで使用する生存時間の値を使用します。"
-#: ../clients/common/settings-docs.c.in:385
+#: ../clients/common/settings-docs.h.in:391
msgid ""
"If specified, this connection will only apply to the WiMAX device whose MAC "
"address matches. This property does not change the MAC address of the device "
@@ -9082,7 +9352,7 @@ msgstr ""
"す。このプロパティーはデバイスの MAC アドレスを変更しません (MAC スプーフィン"
"グとして知られています)。非推奨: 1"
-#: ../clients/common/settings-docs.c.in:387
+#: ../clients/common/settings-docs.h.in:393
msgid ""
"Network Service Provider (NSP) name of the WiMAX network this connection "
"should use. Deprecated: 1"
@@ -9090,21 +9360,21 @@ msgstr ""
"この接続が使用する WiMAX ネットワークのネットワークサービスプロバイダー "
"(NSP) 名。非推奨: 1"
-#: ../clients/nm-online.c:91
+#: ../clients/nm-online.c:89
msgid "Connecting"
msgstr "接続中"
-#: ../clients/nm-online.c:189
+#: ../clients/nm-online.c:187
#, c-format
msgid "Error: timeout creating NMClient object\n"
msgstr "エラー: NMClient オブジェクトの作成でタイムアウト\n"
-#: ../clients/nm-online.c:209
+#: ../clients/nm-online.c:207
#, c-format
msgid "Error: Could not create NMClient object: %s\n"
msgstr "エラー: NMClient オブジェクトを作成できませんでした: %s\n"
-#: ../clients/nm-online.c:235
+#: ../clients/nm-online.c:233
msgid ""
"Time to wait for a connection, in seconds (without the option, default value "
"is 30)"
@@ -9112,35 +9382,35 @@ msgstr ""
"接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は "
"30)"
-#: ../clients/nm-online.c:236
+#: ../clients/nm-online.c:234
msgid "Exit immediately if NetworkManager is not running or connecting"
msgstr "NetworkManager が実行中または接続中でない場合は直ちに終了します"
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:235
msgid "Don't print anything"
msgstr "出力を抑制する"
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:236
msgid "Wait for NetworkManager startup instead of a connection"
msgstr "接続の代わりに NetworkManager の起動を待機します"
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:256
msgid ""
"Waits for NetworkManager to finish activating startup network connections."
msgstr ""
"NetworkManager により、スタートアップネットワーク接続のアクティベートが完了さ"
"れるのを待機します。"
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:263 ../clients/nm-online.c:269
msgid "Invalid option. Please use --help to see a list of valid options."
msgstr ""
"無効なオプションです。--help を使用して有効なオプションの一覧を確認してくださ"
"い。"
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
#: ../clients/tui/nmt-password-dialog.c:174
#: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:134
msgid "OK"
msgstr "OK"
@@ -9150,137 +9420,127 @@ msgstr "OK"
msgid "Could not create temporary file: %s"
msgstr "一時ファイルを作成できませんでした: %s"
-#: ../clients/tui/newt/nmt-newt-utils.c:365
+#: ../clients/tui/newt/nmt-newt-utils.c:363
#, c-format
msgid "Editor failed: %s"
msgstr "エディタが失敗しました: %s"
-#: ../clients/tui/newt/nmt-newt-utils.c:373
-#, c-format
-msgid "Editor failed with status %d"
-msgstr "エディターがステータス %d で失敗しました"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:375
-#, c-format
-msgid "Editor failed with signal %d"
-msgstr "エディターがシグナル %d で失敗しました"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:379
+#: ../clients/tui/newt/nmt-newt-utils.c:369
#, c-format
msgid "Could not re-read file: %s"
msgstr "ファイルの再読み込みができませんでした: %s"
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
-#: ../libnm/nm-device.c:1521
+#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
+#: ../libnm/nm-device.c:1303
msgid "Ethernet"
msgstr "Ethernet"
-#: ../clients/tui/nm-editor-utils.c:150
+#: ../clients/tui/nm-editor-utils.c:148
#, c-format
msgid "Ethernet connection %d"
msgstr "Ethernet 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
-#: ../libnm/nm-device.c:1523
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
+#: ../libnm/nm-device.c:1305
msgid "Wi-Fi"
msgstr "Wi-Fi"
-#: ../clients/tui/nm-editor-utils.c:158
+#: ../clients/tui/nm-editor-utils.c:156
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
-#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2103
+#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1321
msgid "InfiniBand"
msgstr "InfiniBand"
-#: ../clients/tui/nm-editor-utils.c:167
+#: ../clients/tui/nm-editor-utils.c:165
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
-#: ../libnm/nm-device.c:1537
+#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
+#: ../libnm/nm-device.c:1319
msgid "Mobile Broadband"
msgstr "モバイルブロードバンド"
-#: ../clients/tui/nm-editor-utils.c:175
+#: ../clients/tui/nm-editor-utils.c:173
#, c-format
msgid "Mobile broadband connection %d"
msgstr "モバイルブロードバンド接続 %d"
-#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
msgid "DSL"
msgstr "DSL"
-#: ../clients/tui/nm-editor-utils.c:185
+#: ../clients/tui/nm-editor-utils.c:183
#, c-format
msgid "DSL connection %d"
msgstr "DSL 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
-#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1541
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2095
+#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
+#: ../libnm/nm-device.c:1323
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4594
msgid "Bond"
msgstr "ボンド"
-#: ../clients/tui/nm-editor-utils.c:194
+#: ../clients/tui/nm-editor-utils.c:192
#, c-format
msgid "Bond connection %d"
msgstr "ボンド接続 %d"
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
-#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1545
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2099
+#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
+#: ../libnm/nm-device.c:1327
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4930
msgid "Bridge"
msgstr "ブリッジ"
-#: ../clients/tui/nm-editor-utils.c:204
+#: ../clients/tui/nm-editor-utils.c:202
#, c-format
msgid "Bridge connection %d"
msgstr "ブリッジ接続 %d"
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
-#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1543
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2097
+#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
+#: ../libnm/nm-device.c:1325
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4697
msgid "Team"
msgstr "team "
-#: ../clients/tui/nm-editor-utils.c:213
+#: ../clients/tui/nm-editor-utils.c:211
#, c-format
msgid "Team connection %d"
msgstr "team 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
+#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2101 ../libnm-glib/nm-device.c:1840
+#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1329
msgid "VLAN"
msgstr "VLAN"
-#: ../clients/tui/nm-editor-utils.c:221
+#: ../clients/tui/nm-editor-utils.c:219
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 接続 %d"
-#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
msgid "IP tunnel"
msgstr "IP トンネル"
-#: ../clients/tui/nm-editor-utils.c:229
+#: ../clients/tui/nm-editor-utils.c:227
#, c-format
msgid "IP tunnel connection %d"
msgstr "IP トンネル接続 %d"
-#: ../clients/tui/nm-editor-utils.c:244
+#: ../clients/tui/nm-editor-utils.c:242
#, c-format
msgid "VPN connection %d"
msgstr "VPN 接続 %d"
-#: ../clients/tui/nmt-device-entry.c:370
+#: ../clients/tui/nmt-device-entry.c:368
msgid "Select..."
msgstr "選択..."
@@ -9295,7 +9555,7 @@ msgid "Edit..."
msgstr "編集..."
#: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:531
+#: ../clients/tui/nmtui-edit.c:529
msgid "Delete"
msgstr "削除"
@@ -9321,40 +9581,40 @@ msgstr "無効な接続 '%s' のエディターを作成できませんでした
msgid "Edit Connection"
msgstr "接続の編集"
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:173
#, c-format
msgid "Unable to save connection: %s"
msgstr "接続を保存できません: %s"
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:187
#, c-format
msgid "Unable to add new connection: %s"
msgstr "新しい接続を追加できません: %s"
-#: ../clients/tui/nmt-editor.c:333
+#: ../clients/tui/nmt-editor.c:332
msgid "Profile name"
msgstr "プロファイル名"
-#: ../clients/tui/nmt-editor.c:344
+#: ../clients/tui/nmt-editor.c:343
msgid "Ethernet device"
msgstr "Ethernet デバイス"
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:345
msgid "Device"
msgstr "デバイス"
#. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:406
+#: ../clients/tui/nmt-editor.c:405
msgid "Automatically connect"
msgstr "自動的に接続する"
-#: ../clients/tui/nmt-editor.c:412
+#: ../clients/tui/nmt-editor.c:411
msgid "Available to all users"
msgstr "全ユーザーに使用可能"
-#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
-#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
+#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
msgid "Cancel"
msgstr "取り消し"
@@ -9868,27 +10128,27 @@ msgstr "毎回、このパスワードの入力を求める"
msgid "Show password"
msgstr "パスワードを表示する"
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
msgid "Destination"
msgstr "送信先"
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
msgid "Prefix"
msgstr "プレフィックス"
-#: ../clients/tui/nmt-route-table.c:200
+#: ../clients/tui/nmt-route-table.c:196
msgid "Next Hop"
msgstr "次のホップ"
-#: ../clients/tui/nmt-route-table.c:208
+#: ../clients/tui/nmt-route-table.c:204
msgid "Metric"
msgstr "メトリック"
-#: ../clients/tui/nmt-route-table.c:228
+#: ../clients/tui/nmt-route-table.c:224
msgid "No custom routes are defined."
msgstr "カスタムのルートが定義されていません。"
-#: ../clients/tui/nmt-slave-list.c:136
+#: ../clients/tui/nmt-slave-list.c:134
msgid "Select the type of slave connection you wish to add."
msgstr "追加したいスレーブ接続のタイプを選択してください。"
@@ -9945,12 +10205,12 @@ msgstr "アクティベート"
msgid "Deactivate"
msgstr "解除"
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui.c:128
msgid "Quit"
msgstr "終了"
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
msgid "Back"
msgstr "戻る"
@@ -9963,15 +10223,15 @@ msgstr "そのような接続 '%s' はありません"
msgid "Connection is already active"
msgstr "接続はすでにアクティブになっています"
-#: ../clients/tui/nmtui-edit.c:230
+#: ../clients/tui/nmtui-edit.c:228
msgid "Create"
msgstr "作成"
-#: ../clients/tui/nmtui-edit.c:372
+#: ../clients/tui/nmtui-edit.c:370
msgid "Select the type of connection you wish to create."
msgstr "作成したい接続タイプを選択してください。"
-#: ../clients/tui/nmtui-edit.c:380
+#: ../clients/tui/nmtui-edit.c:378
msgid ""
"If you are creating a VPN, and the VPN connection you wish to create does "
"not appear in the list, you may not have the correct VPN plugin installed."
@@ -9979,21 +10239,21 @@ msgstr ""
"VPN の作成中、作成したい VPN 接続が一覧に表示されない場合、適切な VPN プラグ"
"インがインストールされていない可能性があります。"
-#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
+#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
msgid "New Connection"
msgstr "新規の接続"
-#: ../clients/tui/nmtui-edit.c:471
+#: ../clients/tui/nmtui-edit.c:469
#, c-format
msgid "Unable to delete connection: %s"
msgstr "接続を削除できません: %s"
-#: ../clients/tui/nmtui-edit.c:510
+#: ../clients/tui/nmtui-edit.c:508
#, c-format
msgid "Could not delete connection '%s': %s"
msgstr "接続 '%s' を削除できませんでした: %s"
-#: ../clients/tui/nmtui-edit.c:532
+#: ../clients/tui/nmtui-edit.c:530
#, c-format
msgid "Are you sure you want to delete the connection '%s'?"
msgstr "本当に接続 '%s' を削除してもいいですか?"
@@ -10017,129 +10277,129 @@ msgstr "ホスト名を '%s' に設定します"
msgid "Unable to set hostname: %s"
msgstr "ホスト名を設定できません: %s"
-#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
msgid "connection"
msgstr "接続"
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:52
msgid "Edit a connection"
msgstr "接続の編集"
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:55
msgid "Activate a connection"
msgstr "接続をアクティベートする"
-#: ../clients/tui/nmtui.c:59
+#: ../clients/tui/nmtui.c:57
msgid "new hostname"
msgstr "新規のホスト名"
-#: ../clients/tui/nmtui.c:60
+#: ../clients/tui/nmtui.c:58
msgid "Set system hostname"
msgstr "システムのホスト名を設定する"
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:102
msgid "NetworkManager TUI"
msgstr "NetworkManager TUI"
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:110
msgid "Please select an option"
msgstr "オプションを選択してください"
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:158
msgid "Usage"
msgstr "使い方"
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:239
msgid "Could not parse arguments"
msgstr "引数を解析できませんでした"
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:249
#, c-format
msgid "Could not contact NetworkManager: %s.\n"
msgstr "NetworkManager に接続できませんでした: %s.\n"
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:254
msgid "NetworkManager is not running."
msgstr "NetworkManager が実行していません。"
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
#, c-format
msgid "PEM key file had no end tag '%s'."
msgstr "PEM キーファイルには終了タグ '%s' がありません。"
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
#, c-format
msgid "Doesn't look like a PEM private key file."
msgstr "PEM プライベートキーファイルではないようです。"
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
#, c-format
msgid "Malformed PEM file: Proc-Type was not first tag."
msgstr "不正形式の PEM ファイル: Proc-Type は最初のタグではありません。"
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
#, c-format
msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
msgstr "不正形式の PEM ファイル: 不明な Proc-Type タグ '%s' です。"
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:178
#, c-format
msgid "Malformed PEM file: DEK-Info was not the second tag."
msgstr "不正形式の PEM ファイル: DEK-Info は２つ目のタグではありません。"
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:189
#, c-format
msgid "Malformed PEM file: no IV found in DEK-Info tag."
msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見つかりません。"
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:196
#, c-format
msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
msgstr "不正形式の PEM ファイル: DEK-Info タグ内に無効な形式の IV"
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:211
#, c-format
msgid "Malformed PEM file: unknown private key cipher '%s'."
msgstr "不正形式の PEM ファイル: 不明なプライベートキー暗号文 '%s'。"
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:230
#, c-format
msgid "Could not decode private key."
msgstr "プライベートキーを復号できませんでした。"
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:282
msgid "Failed to find expected PKCS#8 start tag."
msgstr "期待されている PKCS#8 開始タグの検出に失敗しました。"
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:290
#, c-format
msgid "Failed to find expected PKCS#8 end tag '%s'."
msgstr "期待されている PKCS#8 終了タグ '%s' の検出に失敗しました。"
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:309
msgid "Failed to decode PKCS#8 private key."
msgstr "PKCS#8 プライベートキーの復号に失敗しました。"
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:351
#, c-format
msgid "IV must be an even number of bytes in length."
msgstr "IV は、その長さで偶数のバイト数でなければなりません。"
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:365
#, c-format
msgid "IV contains non-hexadecimal digits."
msgstr "IV は 16進法でない数字を含んでいます。"
#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:405
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
#: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
#, c-format
msgid "Private key cipher '%s' was unknown."
msgstr "プライベートキー暗号文 '%s' は不明です。"
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:515
#, c-format
msgid "Unable to determine private key type."
msgstr "プライベートキーのタイプを判定できません。"
@@ -10149,17 +10409,17 @@ msgstr "プライベートキーのタイプを判定できません。"
msgid "Password provided, but key was not encrypted."
msgstr "パスワードが提供されましたが、キーは暗号化されませんでした。"
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:570
#, c-format
msgid "PEM certificate had no start tag '%s'."
msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:579
#, c-format
msgid "PEM certificate had no end tag '%s'."
msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:597
#, c-format
msgid "Failed to decode certificate."
msgstr "証明書の復号に失敗しました。"
@@ -10195,47 +10455,47 @@ msgstr "プライベートキーの復号に失敗しました: 予想外の不
msgid "Failed to decrypt the private key."
msgstr "プライベートキーの復号に失敗しました。"
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:280
#, c-format
msgid "Failed to initialize the encryption cipher context: %s (%s)"
msgstr "暗号化暗号文コンテキストの初期化に失敗しました: %s (%s)"
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:289
#, c-format
msgid "Failed to encrypt the data: %s (%s)"
msgstr "データの暗号化に失敗しました: %s (%s)"
-#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:329
#, c-format
msgid "Error initializing certificate data: %s"
msgstr "証明書データの初期化にエラー発生: %s"
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:351
#, c-format
msgid "Couldn't decode certificate: %s"
msgstr "証明書をデコードできませんでした: %s"
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:375
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %s"
msgstr "PKCS#12 デコーダーを初期化できません: %s"
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:388
#, c-format
msgid "Couldn't decode PKCS#12 file: %s"
msgstr "PKCS#12 ファイルをデコードできません: %s"
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:400
#, c-format
msgid "Couldn't verify PKCS#12 file: %s"
msgstr "PKCS#12 ファイルを確証できません: %s"
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:428
#, c-format
msgid "Couldn't initialize PKCS#8 decoder: %s"
msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:451
#, c-format
msgid "Couldn't decode PKCS#8 file: %s"
msgstr "PKCS#8 ファイルをデコードできませんでした: %s"
@@ -10356,246 +10616,240 @@ msgstr "不明な設定名"
msgid "duplicate setting name"
msgstr "重複する設定名"
-#: ../libnm-core/nm-connection.c:1233
+#: ../libnm-core/nm-connection.c:1230
msgid "setting not found"
msgstr "設定が見つかりません"
-#: ../libnm-core/nm-connection.c:1300
+#: ../libnm-core/nm-connection.c:1297
msgid "setting not allowed in slave connection"
msgstr "設定がスレーブ接続で許可されません"
-#: ../libnm-core/nm-connection.c:1316
+#: ../libnm-core/nm-connection.c:1313
msgid "setting is required for non-slave connections"
msgstr "設定は非スレーブ接続で必要です"
-#: ../libnm-core/nm-connection.c:1412
+#: ../libnm-core/nm-connection.c:1409
msgid "Unexpected failure to verify the connection"
msgstr "接続を確認するときの予期しない障害"
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1451
msgid "Unexpected failure to normalize the connection"
msgstr "接続を正規化するときの予期しない障害"
-#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
-#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
-#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
-#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
-#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-connection.c:1962 ../libnm-core/nm-setting-8021x.c:2869
+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2917
+#: ../libnm-core/nm-setting-8021x.c:2934 ../libnm-core/nm-setting-8021x.c:2976
+#: ../libnm-core/nm-setting-8021x.c:2988 ../libnm-core/nm-setting-8021x.c:3006
+#: ../libnm-core/nm-setting-8021x.c:3018 ../libnm-core/nm-setting-8021x.c:3042
+#: ../libnm-core/nm-setting-8021x.c:3221 ../libnm-core/nm-setting-adsl.c:189
#: ../libnm-core/nm-setting-bluetooth.c:138
#: ../libnm-core/nm-setting-bluetooth.c:196
#: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
-#: ../libnm-core/nm-setting-connection.c:894
-#: ../libnm-core/nm-setting-connection.c:937
-#: ../libnm-core/nm-setting-connection.c:1066
-#: ../libnm-core/nm-setting-ip-config.c:2514
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-connection.c:912
+#: ../libnm-core/nm-setting-connection.c:955
+#: ../libnm-core/nm-setting-connection.c:1095
+#: ../libnm-core/nm-setting-ip-config.c:2484
+#: ../libnm-core/nm-setting-ip-tunnel.c:373
#: ../libnm-core/nm-setting-olpc-mesh.c:120
-#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
-#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
+#: ../libnm-core/nm-setting-ovs-patch.c:94 ../libnm-core/nm-setting-pppoe.c:161
+#: ../libnm-core/nm-setting-vpn.c:489 ../libnm-core/nm-setting-vxlan.c:360
#: ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wireless-security.c:900
-#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
-#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
-#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
-#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
-#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
-#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
-#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
-#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
-#: ../libnm-util/nm-setting-connection.c:768
-#: ../libnm-util/nm-setting-connection.c:784
-#: ../libnm-util/nm-setting-connection.c:845
+#: ../libnm-core/nm-setting-wireless-security.c:920
+#: ../libnm-core/nm-setting-wireless.c:752 ../libnm-util/nm-setting.c:1355
+#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
+#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
+#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
+#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
+#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
+#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
+#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
+#: ../libnm-util/nm-setting-connection.c:765
+#: ../libnm-util/nm-setting-connection.c:781
+#: ../libnm-util/nm-setting-connection.c:842
#: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:833
-#: ../libnm-util/nm-setting-ip6-config.c:899
+#: ../libnm-util/nm-setting-ip6-config.c:831
+#: ../libnm-util/nm-setting-ip6-config.c:897
#: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
-#: ../libnm-util/nm-setting-wimax.c:150
-#: ../libnm-util/nm-setting-wireless-security.c:891
-#: ../libnm-util/nm-setting-wireless.c:769
+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
+#: ../libnm-util/nm-setting-wimax.c:149
+#: ../libnm-util/nm-setting-wireless-security.c:890
+#: ../libnm-util/nm-setting-wireless.c:768
msgid "property is missing"
-msgstr "プロパティがありません"
+msgstr "プロパティーがありません"
-#: ../libnm-core/nm-connection.c:2117
+#: ../libnm-core/nm-connection.c:2106
msgid "IP Tunnel"
msgstr "IP トンネル"
-#: ../libnm-core/nm-dbus-utils.c:188
+#: ../libnm-core/nm-dbus-utils.c:189
#, c-format
msgid "Method returned type '%s', but expected '%s'"
msgstr "メソッドはタイプ '%s' を返しましたが、'%s' を想定していました"
-#: ../libnm-core/nm-keyfile-reader.c:144
+#: ../libnm-core/nm-keyfile.c:156
msgid "ignoring missing number"
msgstr "不明な数字を無視"
-#: ../libnm-core/nm-keyfile-reader.c:152
+#: ../libnm-core/nm-keyfile.c:164
#, c-format
msgid "ignoring invalid number '%s'"
msgstr "無効な数字 '%s' を無視"
-#: ../libnm-core/nm-keyfile-reader.c:173
+#: ../libnm-core/nm-keyfile.c:185
#, c-format
msgid "ignoring invalid %s address: %s"
msgstr "無効な %s アドレスを無視: %s"
-#: ../libnm-core/nm-keyfile-reader.c:215
+#: ../libnm-core/nm-keyfile.c:227
#, c-format
msgid "ignoring invalid gateway '%s' for %s route"
msgstr "無効なゲートウェイ '%s' (%s ルート用) を無視"
-#: ../libnm-core/nm-keyfile-reader.c:236
+#: ../libnm-core/nm-keyfile.c:248
#, c-format
msgid "ignoring invalid %s route: %s"
msgstr "無効な %s ルートを無視: %s"
-#: ../libnm-core/nm-keyfile-reader.c:362
+#: ../libnm-core/nm-keyfile.c:373
#, c-format
msgid "unexpected character '%c' for address %s: '%s' (position %td)"
msgstr "アドレス %c の予期しない文字 '%s': '%s' (位置 %td)"
-#: ../libnm-core/nm-keyfile-reader.c:372
+#: ../libnm-core/nm-keyfile.c:383
#, c-format
msgid "unexpected character '%c' for %s: '%s' (position %td)"
msgstr "%c の予期しない文字 '%s': '%s' (位置 %td)"
-#: ../libnm-core/nm-keyfile-reader.c:381
+#: ../libnm-core/nm-keyfile.c:392
#, c-format
msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
msgstr "%c の予期しないプレフィックス長の文字 '%s': '%s' (位置 %td)"
-#: ../libnm-core/nm-keyfile-reader.c:392
+#: ../libnm-core/nm-keyfile.c:403
#, c-format
msgid "garbage at the end of value %s: '%s'"
msgstr "値 %s の後のガベッジ: '%s'"
-#: ../libnm-core/nm-keyfile-reader.c:398
+#: ../libnm-core/nm-keyfile.c:409
#, c-format
msgid "deprecated semicolon at the end of value %s: '%s'"
msgstr "値 %s の後の非推奨のセミコロン: '%s'"
-#: ../libnm-core/nm-keyfile-reader.c:413
+#: ../libnm-core/nm-keyfile.c:424
#, c-format
msgid "invalid prefix length for %s '%s', defaulting to %d"
msgstr "%s '%s' の無効なプレフィックス長 (デフォルト値は %d)"
-#: ../libnm-core/nm-keyfile-reader.c:420
+#: ../libnm-core/nm-keyfile.c:431
#, c-format
msgid "missing prefix length for %s '%s', defaulting to %d"
msgstr "%s '%s' の不明なプレフィックス長 (デフォルト値は %d)"
-#: ../libnm-core/nm-keyfile-reader.c:554
+#: ../libnm-core/nm-keyfile.c:695
#, c-format
-msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "無効な DNS サーバー IPv4 アドレス '%s' を無視"
+msgid "ignoring invalid DNS server IPv%c address '%s'"
+msgstr "無効な DNS サーバー IPv%c アドレス '%s' を無視"
-#: ../libnm-core/nm-keyfile-reader.c:593
-#, c-format
-msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "無効な DNS サーバー IPv6 アドレス '%s' を無視"
-
-#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
+#: ../libnm-core/nm-keyfile.c:791 ../libnm-core/nm-keyfile.c:2541
#, c-format
msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
msgstr "無効なバイト要素 '%d' (0〜255 以外) を無視"
-#: ../libnm-core/nm-keyfile-reader.c:698
+#: ../libnm-core/nm-keyfile.c:802
msgid "ignoring invalid MAC address"
msgstr "有効な MAC アドレスを無視"
-#: ../libnm-core/nm-keyfile-reader.c:935
+#: ../libnm-core/nm-keyfile.c:1039
msgid "ignoring invalid SSID"
msgstr "無効な SSID を無視"
-#: ../libnm-core/nm-keyfile-reader.c:951
+#: ../libnm-core/nm-keyfile.c:1055
msgid "ignoring invalid raw password"
msgstr "無効な生パスワードを無視"
-#: ../libnm-core/nm-keyfile-reader.c:1026
-#: ../libnm-core/nm-keyfile-reader.c:1202
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "証明書またはキーファイル '%s' が存在しません"
+#: ../libnm-core/nm-keyfile.c:1193
+msgid "invalid key/cert value"
+msgstr "無効なキー/証明書値"
-#: ../libnm-core/nm-keyfile-reader.c:1031
+#: ../libnm-core/nm-keyfile.c:1204
#, c-format
msgid "invalid key/cert value path \"%s\""
msgstr "無効なキー/証明書値パス \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1041
+#: ../libnm-core/nm-keyfile.c:1220 ../libnm-core/nm-keyfile.c:1303
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "証明書またはキーファイル '%s' が存在しません"
+
+#: ../libnm-core/nm-keyfile.c:1229
#, c-format
msgid "invalid PKCS#11 URI \"%s\""
msgstr "無効な PKCS#11 URI \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1079
+#: ../libnm-core/nm-keyfile.c:1273
msgid "invalid key/cert value data:;base64, is not base64"
msgstr "無効なキー/証明書値 data:;base64, が base64 ではありません"
-#: ../libnm-core/nm-keyfile-reader.c:1092
+#: ../libnm-core/nm-keyfile.c:1282
msgid "invalid key/cert value data:;base64,file://"
msgstr "無効なキー/証明書値 data:;base64,file://"
-#: ../libnm-core/nm-keyfile-reader.c:1239
+#: ../libnm-core/nm-keyfile.c:1315
msgid "invalid key/cert value is not a valid blob"
msgstr "無効なキー/証明書値は、有効なブロブではありません"
-#: ../libnm-core/nm-keyfile-reader.c:1244
-msgid "invalid key/cert value"
-msgstr "無効なキー/証明書値"
-
-#: ../libnm-core/nm-keyfile-reader.c:1291
+#: ../libnm-core/nm-keyfile.c:1365
#, c-format
msgid "invalid parity value '%s'"
msgstr "無効なパリティー値 '%s'"
-#: ../libnm-core/nm-keyfile-reader.c:1309
+#: ../libnm-core/nm-keyfile.c:1383
#, c-format
msgid "ignoring invalid team configuration: %s"
msgstr "無効な team 設定を無視: %s"
-#: ../libnm-core/nm-keyfile-reader.c:1352
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1426
+#, c-format
msgid "invalid qdisc: %s"
-msgstr "無効な IP アドレス: %s"
+msgstr "無効な qdisc: %s"
-#: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1474
+#, c-format
msgid "invalid tfilter: %s"
-msgstr "無効なプレフィックス %s"
+msgstr "無効な tfilter: %s"
-#: ../libnm-core/nm-keyfile-reader.c:1622
+#: ../libnm-core/nm-keyfile.c:2450
#, c-format
msgid "error loading setting value: %s"
msgstr "設定値のロード中にエラーが発生しました: %s"
-#: ../libnm-core/nm-keyfile-reader.c:1654
+#: ../libnm-core/nm-keyfile.c:2475
#, c-format
msgid "invalid negative value (%i)"
msgstr "無効な負の値 (%i)"
-#: ../libnm-core/nm-keyfile-reader.c:1675
+#: ../libnm-core/nm-keyfile.c:2496
#, c-format
msgid "invalid char value (%i)"
msgstr "無効な char 値 (%i)"
-#: ../libnm-core/nm-keyfile-reader.c:1698
+#: ../libnm-core/nm-keyfile.c:2518
#, c-format
msgid "invalid int64 value (%s)"
msgstr "無効な int64 値 (%s)"
-#: ../libnm-core/nm-keyfile-reader.c:1757
+#: ../libnm-core/nm-keyfile.c:2577
#, c-format
msgid "too large FLAGS property '%s' (%llu)"
msgstr "大きすぎる FLAGS プロパティー '%s' (%llu)"
-#: ../libnm-core/nm-keyfile-reader.c:1770
+#: ../libnm-core/nm-keyfile.c:2590
#, c-format
msgid "unhandled setting property type '%s'"
msgstr "プロパティータイプ '%s' の設定が未処理"
-#: ../libnm-core/nm-keyfile-reader.c:1801
+#: ../libnm-core/nm-keyfile.c:2619
#, c-format
msgid "invalid setting name '%s'"
msgstr "無効な設定名 '%s'"
@@ -10625,130 +10879,130 @@ msgid "CA certificate must be in X.509 format"
msgstr "CA 証明書は X.509 形式である必要があります"
#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
-#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
+#: ../libnm-core/nm-setting-8021x.c:1922 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
msgid "invalid certificate format"
msgstr "無効な証明書形式"
-#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2274 ../libnm-util/nm-setting-8021x.c:1811
msgid "invalid private key"
msgstr "無効なプライベートキー"
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2616 ../libnm-util/nm-setting-8021x.c:2122
msgid "invalid phase2 private key"
msgstr "無効な phase2 プライベートキー"
-#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
-#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
-#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
-#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
-#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2893
+#: ../libnm-core/nm-setting-8021x.c:2924 ../libnm-core/nm-setting-8021x.c:2941
+#: ../libnm-core/nm-setting-8021x.c:2982 ../libnm-core/nm-setting-8021x.c:2994
+#: ../libnm-core/nm-setting-8021x.c:3012 ../libnm-core/nm-setting-8021x.c:3024
+#: ../libnm-core/nm-setting-8021x.c:3049 ../libnm-core/nm-setting-adsl.c:196
#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
-#: ../libnm-core/nm-setting-connection.c:901
-#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-connection.c:919
+#: ../libnm-core/nm-setting-connection.c:967 ../libnm-core/nm-setting-gsm.c:299
#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2491
#: ../libnm-core/nm-setting-ip4-config.c:198
#: ../libnm-core/nm-setting-ip4-config.c:205
#: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
-#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
+#: ../libnm-core/nm-setting-vpn.c:498 ../libnm-core/nm-setting-vpn.c:508
#: ../libnm-core/nm-setting-wimax.c:135
-#: ../libnm-core/nm-setting-wireless-security.c:930
-#: ../libnm-core/nm-setting-wireless-security.c:954
-#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
-#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
-#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
-#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
-#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
-#: ../libnm-util/nm-setting-cdma.c:178
-#: ../libnm-util/nm-setting-connection.c:775
-#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
-#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-core/nm-setting-wireless-security.c:950
+#: ../libnm-core/nm-setting-wireless-security.c:974
+#: ../libnm-core/nm-setting.c:1116 ../libnm-util/nm-setting-8021x.c:2331
+#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
+#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
+#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
+#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
+#: ../libnm-util/nm-setting-cdma.c:177
+#: ../libnm-util/nm-setting-connection.c:772
+#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
+#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
#: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
-#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
-#: ../libnm-util/nm-setting-wimax.c:159
-#: ../libnm-util/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:945
+#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
+#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
+#: ../libnm-util/nm-setting-wimax.c:158
+#: ../libnm-util/nm-setting-wireless-security.c:920
+#: ../libnm-util/nm-setting-wireless-security.c:944
msgid "property is empty"
-msgstr "プロパティが空です"
+msgstr "プロパティーが空です"
-#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
-#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
-#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
+#: ../libnm-core/nm-setting-8021x.c:2906 ../libnm-core/nm-setting-8021x.c:2954
+#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
+#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
#, c-format
msgid "has to match '%s' property for PKCS#12"
-msgstr "PKCS#12 の '%s' プロパティと一致しなければなりません"
+msgstr "PKCS#12 の '%s' プロパティーと一致しなければなりません"
-#: ../libnm-core/nm-setting-8021x.c:3197
+#: ../libnm-core/nm-setting-8021x.c:3183
#, c-format
msgid "certificate is invalid: %s"
msgstr "証明書が無効です: %s"
-#: ../libnm-core/nm-setting-8021x.c:3207
+#: ../libnm-core/nm-setting-8021x.c:3193
#, c-format
msgid "password is not supported when certificate is not on a PKCS#11 token"
msgstr "証明書が PKCS#11 トークンにない場合は、パスワードはサポートされません"
-#: ../libnm-core/nm-setting-8021x.c:3244
+#: ../libnm-core/nm-setting-8021x.c:3230
#: ../libnm-core/nm-setting-bluetooth.c:123
#: ../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:215
-#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-ip6-config.c:237
+#: ../libnm-core/nm-setting-ip6-config.c:248
#: ../libnm-core/nm-setting-olpc-mesh.c:149
#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
#: ../libnm-core/nm-setting-wired.c:688
-#: ../libnm-core/nm-setting-wireless-security.c:973
-#: ../libnm-core/nm-setting-wireless-security.c:982
-#: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1027
-#: ../libnm-core/nm-setting-wireless-security.c:1037
-#: ../libnm-core/nm-setting-wireless-security.c:1060
-#: ../libnm-core/nm-setting-wireless-security.c:1085
-#: ../libnm-core/nm-setting-wireless-security.c:1112
-#: ../libnm-core/nm-setting-wireless-security.c:1151
-#: ../libnm-core/nm-setting-wireless.c:811
-#: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
-#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
-#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
-#: ../libnm-util/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:1002
+#: ../libnm-core/nm-setting-wireless-security.c:1011
+#: ../libnm-core/nm-setting-wireless-security.c:1047
+#: ../libnm-core/nm-setting-wireless-security.c:1057
+#: ../libnm-core/nm-setting-wireless-security.c:1080
+#: ../libnm-core/nm-setting-wireless-security.c:1105
+#: ../libnm-core/nm-setting-wireless-security.c:1132
+#: ../libnm-core/nm-setting-wireless-security.c:1171
+#: ../libnm-core/nm-setting-wireless.c:813
+#: ../libnm-core/nm-setting-wireless.c:822
+#: ../libnm-core/nm-setting-wireless.c:833 ../libnm-util/nm-setting.c:1365
+#: ../libnm-util/nm-setting.c:1383 ../libnm-util/nm-setting.c:1402
+#: ../libnm-util/nm-setting-8021x.c:2652 ../libnm-util/nm-setting-8021x.c:2686
+#: ../libnm-util/nm-setting-bluetooth.c:150
#: ../libnm-util/nm-setting-infiniband.c:205
#: ../libnm-util/nm-setting-infiniband.c:221
#: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:890
+#: ../libnm-util/nm-setting-ip6-config.c:888
#: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
-#: ../libnm-util/nm-setting-wired.c:667
-#: ../libnm-util/nm-setting-wireless-security.c:964
-#: ../libnm-util/nm-setting-wireless-security.c:973
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1028
-#: ../libnm-util/nm-setting-wireless.c:829
-#: ../libnm-util/nm-setting-wireless.c:838
-#: ../libnm-util/nm-setting-wireless.c:847
+#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
+#: ../libnm-util/nm-setting-wired.c:666
+#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:972
+#: ../libnm-util/nm-setting-wireless-security.c:981
+#: ../libnm-util/nm-setting-wireless-security.c:1017
+#: ../libnm-util/nm-setting-wireless-security.c:1027
+#: ../libnm-util/nm-setting-wireless.c:828
+#: ../libnm-util/nm-setting-wireless.c:837
+#: ../libnm-util/nm-setting-wireless.c:846
msgid "property is invalid"
-msgstr "プロパティが無効です"
+msgstr "プロパティーが無効です"
-#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
-#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
-#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-8021x.c:3255 ../libnm-core/nm-setting-8021x.c:3265
+#: ../libnm-core/nm-setting-8021x.c:3275 ../libnm-core/nm-setting-8021x.c:3294
+#: ../libnm-core/nm-setting-8021x.c:3304 ../libnm-core/nm-setting-adsl.c:208
#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
-#: ../libnm-core/nm-setting-wireless-security.c:909
-#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
-#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
-#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
-#: ../libnm-util/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless-security.c:929
+#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
+#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
+#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
+#: ../libnm-util/nm-setting-wireless-security.c:899
#, c-format
msgid "'%s' is not a valid value for the property"
-msgstr "'%s' は有効なプロパティの値ではありません"
+msgstr "'%s' はプロパティーの有効な値ではありません"
-#: ../libnm-core/nm-setting-8021x.c:3299
+#: ../libnm-core/nm-setting-8021x.c:3285
msgid "invalid auth flags"
msgstr "無効な auth フラグ"
@@ -10762,27 +11016,27 @@ msgstr "'%s' 接続には '%s' または '%s' 設定が必要です"
msgid "'%s' connection requires '%s' setting"
msgstr "'%s' 接続には '%s' 設定が必要です"
-#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:516
#, c-format
msgid "invalid option '%s' or its value '%s'"
msgstr "無効なオプション '%s'、またはその値 '%s' です"
-#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:535
#, c-format
msgid "only one of '%s' and '%s' can be set"
msgstr "設定できるのは '%s' と '%s' の一つのみです"
-#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:546
#, c-format
msgid "mandatory option '%s' is missing"
msgstr "必須オプションの '%s' がありません"
-#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:555
#, c-format
msgid "'%s' is not a valid value for '%s'"
msgstr "'%s' は有効な '%s' の値ではありません"
-#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:568
#, c-format
msgid "'%s=%s' is incompatible with '%s > 0'"
msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
@@ -10792,36 +11046,36 @@ msgstr "'%s=%s' は '%s > 0' とは互換性がありません"
msgid "'%s' is not valid for the '%s' option: %s"
msgstr "'%s' は '%s' オプションに無効です: %s"
-#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:591
#, c-format
msgid "'%s' option is only valid for '%s=%s'"
msgstr "'%s' オプションは '%s=%s' の場合に限り有効です"
-#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:604
#, c-format
msgid "'%s=%s' is not a valid configuration for '%s'"
msgstr "'%s=%s' は '%s' の有効な設定ではありません"
#: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
#: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
-#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
-#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
+#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
+#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
#, c-format
msgid "'%s' option requires '%s' option to be set"
msgstr ""
"'%s' オプションを使用する場合は、'%s' オプションを設定する必要があります"
-#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:657
#, c-format
msgid "'%s' option is empty"
msgstr "'%s' オプションが空白です"
-#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:669
#, c-format
msgid "'%s' is not a valid IPv4 address for '%s' option"
msgstr "'%s' は '%s' オプション用の有効な IPv4 アドレスではありません"
-#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:696
#, c-format
msgid "'%s' option is only valid with mode '%s'"
msgstr "'%s' オプションはモード '%s' でのみ有効です"
@@ -10842,18 +11096,18 @@ msgid "'%s' option is not valid with mode '%s'"
msgstr "'%s' オプションは、'%s' モードでは有効ではありません。"
#: ../libnm-core/nm-setting-bridge-port.c:127
-#: ../libnm-core/nm-setting-ovs-interface.c:262
+#: ../libnm-core/nm-setting-ovs-interface.c:261
#: ../libnm-core/nm-setting-ovs-port.c:189
#: ../libnm-core/nm-setting-ovs-bridge.c:152
-#: ../libnm-core/nm-setting-team-port.c:358
+#: ../libnm-core/nm-setting-team-port.c:357
#, c-format
msgid "missing setting"
msgstr "不明な設定"
#: ../libnm-core/nm-setting-bridge-port.c:138
-#: ../libnm-core/nm-setting-ovs-interface.c:283
+#: ../libnm-core/nm-setting-ovs-interface.c:282
#: ../libnm-core/nm-setting-ovs-port.c:210
-#: ../libnm-core/nm-setting-team-port.c:369
+#: ../libnm-core/nm-setting-team-port.c:368
#, c-format
msgid ""
"A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -10862,15 +11116,15 @@ msgstr ""
"'%s' 設定の接続では、スレーブタイプは '%s' に設定する必要がありますが、'%s' "
"に設定されています。"
-#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:268
#, c-format
msgid "value '%d' is out of range <%d-%d>"
msgstr "値 '%d' は <%d-%d> の範囲外です"
#: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
-#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
-#: ../libnm-util/nm-setting-wired.c:691
+#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
+#: ../libnm-util/nm-setting-wired.c:690
msgid "is not a valid MAC address"
msgstr "は有効な MAC アドレスではありません"
@@ -10878,61 +11132,66 @@ msgstr "は有効な MAC アドレスではありません"
msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
msgstr "マスクには、ビット 0 (STP)、1 (MAC)、または 2 (LACP) を設定できません"
-#: ../libnm-core/nm-setting-connection.c:871
+#: ../libnm-core/nm-setting-connection.c:889
#, c-format
msgid "setting required for connection of type '%s'"
msgstr "タイプ '%s' の接続には設定が必要です"
-#: ../libnm-core/nm-setting-connection.c:910
-#: ../libnm-util/nm-setting-connection.c:791
+#: ../libnm-core/nm-setting-connection.c:928
+#: ../libnm-util/nm-setting-connection.c:788
#, c-format
msgid "'%s' is not a valid UUID"
msgstr "'%s' は有効な UUID ではありません"
-#: ../libnm-core/nm-setting-connection.c:960
+#: ../libnm-core/nm-setting-connection.c:978
#, c-format
msgid "connection type '%s' is not valid"
msgstr "接続タイプ '%s' は無効です"
-#: ../libnm-core/nm-setting-connection.c:996
-#: ../libnm-util/nm-setting-connection.c:877
+#: ../libnm-core/nm-setting-connection.c:1014
+#: ../libnm-util/nm-setting-connection.c:874
#, c-format
msgid "Unknown slave type '%s'"
msgstr "不明なスレーブタイプ '%s'"
-#: ../libnm-core/nm-setting-connection.c:1007
-#: ../libnm-util/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-connection.c:1025
+#: ../libnm-util/nm-setting-connection.c:884
#, c-format
msgid "Slave connections need a valid '%s' property"
msgstr "スレーブ接続には有効な '%s' プロパティーが必要です"
-#: ../libnm-core/nm-setting-connection.c:1028
-#: ../libnm-util/nm-setting-connection.c:897
+#: ../libnm-core/nm-setting-connection.c:1046
+#: ../libnm-util/nm-setting-connection.c:894
#, c-format
msgid "Cannot set '%s' without '%s'"
msgstr "'%s' を '%s' なしで設定できません"
-#: ../libnm-core/nm-setting-connection.c:1041
+#: ../libnm-core/nm-setting-connection.c:1059
#, c-format
msgid "Only '%s' connections can be enslaved to '%s'"
msgstr "'%s' 接続だけが、'%s' にスレーブ化できます"
-#: ../libnm-core/nm-setting-connection.c:1054
+#: ../libnm-core/nm-setting-connection.c:1072
#, c-format
msgid "metered value %d is not valid"
msgstr "測定値 %d は無効です"
-#: ../libnm-core/nm-setting-connection.c:1075
+#: ../libnm-core/nm-setting-connection.c:1083
+#, c-format
+msgid "mdns value %d is not valid"
+msgstr "mdns value %d は無効です"
+
+#: ../libnm-core/nm-setting-connection.c:1104
#, c-format
msgid "property type should be set to '%s'"
msgstr "プロパティータイプは '%s' に設定する必要があります"
-#: ../libnm-core/nm-setting-connection.c:1090
+#: ../libnm-core/nm-setting-connection.c:1119
#, c-format
msgid "slave-type '%s' requires a '%s' setting in the connection"
msgstr "スレーブタイプ '%s' の接続には '%s' 設定が必要です"
-#: ../libnm-core/nm-setting-connection.c:1100
+#: ../libnm-core/nm-setting-connection.c:1129
#, c-format
msgid ""
"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -10941,56 +11200,61 @@ msgstr ""
"'%s' が設定され、ポートタイプが '%s' のスレーブ接続を検出します。'%s' は "
"'%s' に設定する必要があります"
-#: ../libnm-core/nm-setting-connection.c:1117
+#: ../libnm-core/nm-setting-connection.c:1146
#, c-format
msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
msgstr "'%s' に設定されている '%s' とのスレーブ接続には、'%s' 設定ができません"
-#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:593
msgid "flags invalid"
msgstr "フラグは無効です"
-#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:602
msgid "flags invalid - disabled"
msgstr "フラグは無効です - 無効"
#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
-#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
+#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
msgid "property invalid (not enabled)"
-msgstr "プロパティは無効です (有効になっていません)"
+msgstr "プロパティーは無効です (有効になっていません)"
-#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:637
msgid "element invalid"
msgstr "エレメントは無効です"
-#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:652
msgid "sum not 100%"
msgstr "合計が 100% ではありません"
#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
-#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
+#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
msgid "property invalid"
-msgstr "プロパティは無効です"
+msgstr "プロパティーは無効です"
-#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:708
msgid "property missing"
-msgstr "プロパティがありません"
+msgstr "プロパティーがありません"
-#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
#, c-format
msgid "property value '%s' is empty or too long (>64)"
-msgstr "プロパティ値 '%s' が空白、または長過ぎます (>64)"
+msgstr "プロパティー値 '%s' が空白、または長過ぎます (>64)"
-#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
#, c-format
msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
msgstr "'%s' に無効な文字が含まれています ([A-Za-z._-] を使用してください)"
-#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
#, c-format
msgid "'%s' length is invalid (should be 5 or 6 digits)"
msgstr "'%s' の長さは無効です (5 桁または 6 桁にしてください)"
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
+#, c-format
+msgid "'%s' is not a number"
+msgstr "'%s' は数字ではありません"
+
#: ../libnm-core/nm-setting-gsm.c:415
msgid "property is empty or wrong size"
msgstr "プロパティーが空、または間違ったサイズです"
@@ -11061,89 +11325,89 @@ msgstr "無効な IPv6 アドレスプレフィックス '%u'"
msgid "Invalid routing metric '%s'"
msgstr "無効なルーティングメトリック '%s'"
-#: ../libnm-core/nm-setting-ip-config.c:1317
+#: ../libnm-core/nm-setting-ip-config.c:1287
msgid "unknown attribute"
msgstr "不明な属性"
-#: ../libnm-core/nm-setting-ip-config.c:1327
+#: ../libnm-core/nm-setting-ip-config.c:1297
#, c-format
msgid "invalid attribute type '%s'"
msgstr "無効な属性タイプ '%s'"
-#: ../libnm-core/nm-setting-ip-config.c:1338
+#: ../libnm-core/nm-setting-ip-config.c:1308
#, c-format
msgid "attribute is not valid for a IPv4 route"
msgstr "属性は IPv4 ルートには無効です"
-#: ../libnm-core/nm-setting-ip-config.c:1339
+#: ../libnm-core/nm-setting-ip-config.c:1309
#, c-format
msgid "attribute is not valid for a IPv6 route"
msgstr "属性は IPv6 ルートには無効です"
-#: ../libnm-core/nm-setting-ip-config.c:1355
-#: ../libnm-core/nm-setting-ip-config.c:1379
+#: ../libnm-core/nm-setting-ip-config.c:1325
+#: ../libnm-core/nm-setting-ip-config.c:1349
#, c-format
msgid "'%s' is not a valid IPv4 address"
msgstr "'%s' は有効な IPv4 アドレスではありません"
-#: ../libnm-core/nm-setting-ip-config.c:1356
-#: ../libnm-core/nm-setting-ip-config.c:1380
+#: ../libnm-core/nm-setting-ip-config.c:1326
+#: ../libnm-core/nm-setting-ip-config.c:1350
#, c-format
msgid "'%s' is not a valid IPv6 address"
msgstr "'%s' は有効な IPv6 アドレスではありません"
-#: ../libnm-core/nm-setting-ip-config.c:1370
+#: ../libnm-core/nm-setting-ip-config.c:1340
#, c-format
msgid "invalid prefix %s"
msgstr "無効なプレフィックス %s"
-#: ../libnm-core/nm-setting-ip-config.c:2534
+#: ../libnm-core/nm-setting-ip-config.c:2504
#, c-format
msgid "%d. DNS server address is invalid"
msgstr "%d. DNS サーバーアドレスは無効です"
-#: ../libnm-core/nm-setting-ip-config.c:2550
+#: ../libnm-core/nm-setting-ip-config.c:2520
#, c-format
msgid "%d. IP address is invalid"
msgstr "%d. IP アドレスは無効です"
-#: ../libnm-core/nm-setting-ip-config.c:2562
+#: ../libnm-core/nm-setting-ip-config.c:2532
#, c-format
msgid "%d. IP address has 'label' property with invalid type"
msgstr "%d. IP アドレスには、無効なタイプの 'label' プロパティーがあります"
-#: ../libnm-core/nm-setting-ip-config.c:2571
+#: ../libnm-core/nm-setting-ip-config.c:2541
#, c-format
msgid "%d. IP address has invalid label '%s'"
msgstr "%d. IP アドレスには、無効なラベル '%s' があります"
-#: ../libnm-core/nm-setting-ip-config.c:2585
+#: ../libnm-core/nm-setting-ip-config.c:2555
msgid "gateway cannot be set if there are no addresses configured"
msgstr "アドレスが設定されない場合は、ゲートウェイを設定できません"
-#: ../libnm-core/nm-setting-ip-config.c:2594
+#: ../libnm-core/nm-setting-ip-config.c:2564
msgid "gateway is invalid"
msgstr "ゲートウェイが無効です"
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2578
#, c-format
msgid "%d. route is invalid"
msgstr "%d. ルートは無効です"
-#: ../libnm-core/nm-setting-ip-config.c:2617
+#: ../libnm-core/nm-setting-ip-config.c:2587
#, c-format
msgid "%d. route cannot be a default route"
msgstr "%d. ルートをデフォルトルートにすることはできません"
-#: ../libnm-core/nm-setting-ip-config.c:2628
+#: ../libnm-core/nm-setting-ip-config.c:2598
#, c-format
msgid "a gateway is incompatible with '%s'"
msgstr "ゲートウェイは '%s' と互換性がありません"
#: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:189
#: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:843
+#: ../libnm-util/nm-setting-ip6-config.c:841
#, c-format
msgid "this property cannot be empty for '%s=%s'"
msgstr "'%s=%s' のこのプロパティーを空にすることはできません"
@@ -11151,18 +11415,18 @@ 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:182
-#: ../libnm-core/nm-setting-ip6-config.c:192
-#: ../libnm-core/nm-setting-ip6-config.c:202
+#: ../libnm-core/nm-setting-ip6-config.c:204
+#: ../libnm-core/nm-setting-ip6-config.c:214
+#: ../libnm-core/nm-setting-ip6-config.c:224
#: ../libnm-util/nm-setting-ip4-config.c:891
#: ../libnm-util/nm-setting-ip4-config.c:901
#: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:855
-#: ../libnm-util/nm-setting-ip6-config.c:865
-#: ../libnm-util/nm-setting-ip6-config.c:877
+#: ../libnm-util/nm-setting-ip6-config.c:853
+#: ../libnm-util/nm-setting-ip6-config.c:863
+#: ../libnm-util/nm-setting-ip6-config.c:875
#, c-format
msgid "this property is not allowed for '%s=%s'"
-msgstr "このプロパティは '%s=%s' には許可されていません"
+msgstr "このプロパティーは '%s=%s' には許可されていません"
#: ../libnm-core/nm-setting-ip4-config.c:214
#, c-format
@@ -11182,105 +11446,114 @@ msgstr "'%s=%s' では複数のアドレスは許可されていません"
msgid "property should be TRUE when method is set to disabled"
msgstr "メソッドが無効に設定されている場合は、プロパティーは TRUE にします"
-#: ../libnm-core/nm-setting-ip6-config.c:241
+#: ../libnm-core/nm-setting-ip6-config.c:263
msgid "value is not a valid token"
msgstr "値 は有効なトークンではありません"
-#: ../libnm-core/nm-setting-ip6-config.c:252
+#: ../libnm-core/nm-setting-ip6-config.c:274
msgid "only makes sense with EUI64 address generation mode"
msgstr "EUI64 アドレス生成モードでのみ、意味が通じます"
-#: ../libnm-core/nm-setting-ip6-config.c:264
+#: ../libnm-core/nm-setting-ip6-config.c:285
+msgid "invalid DUID"
+msgstr "無効な DUID"
+
+#: ../libnm-core/nm-setting-ip6-config.c:297
msgid "token is not in canonical form"
msgstr "トークンが正規形式ではありません"
-#: ../libnm-core/nm-setting-ip6-config.c:276
+#: ../libnm-core/nm-setting-ip6-config.c:309
msgid "property should be TRUE when method is set to ignore"
msgstr "メソッドが ignore に設定されている場合は、プロパティーは TRUE にします"
-#: ../libnm-core/nm-setting-ip-tunnel.c:318
+#: ../libnm-core/nm-setting-ip-tunnel.c:339
#, c-format
msgid "'%d' is not a valid tunnel mode"
msgstr "'%d' は有効なトンネルモードではありません"
-#: ../libnm-core/nm-setting-ip-tunnel.c:330
-#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-ip-tunnel.c:351
+#: ../libnm-core/nm-setting-macsec.c:319 ../libnm-core/nm-setting-macvlan.c:163
#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
#: ../libnm-util/nm-setting-vlan.c:567
#, c-format
msgid "'%s' is neither an UUID nor an interface name"
msgstr "'%s' は UUID、インターフェース名のいずれでもありません"
-#: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:361
+#: ../libnm-core/nm-setting-ip-tunnel.c:362
+#: ../libnm-core/nm-setting-ip-tunnel.c:382
#, c-format
msgid "'%s' is not a valid IPv%c address"
msgstr "'%s' は有効な IPv%c アドレスではありません"
-#: ../libnm-core/nm-setting-ip-tunnel.c:375
+#: ../libnm-core/nm-setting-ip-tunnel.c:396
msgid "tunnel keys can only be specified for GRE tunnels"
msgstr "トンネルキーは GRE トンネルに対してのみ指定できます"
-#: ../libnm-core/nm-setting-ip-tunnel.c:388
-#: ../libnm-core/nm-setting-ip-tunnel.c:404
+#: ../libnm-core/nm-setting-ip-tunnel.c:409
+#: ../libnm-core/nm-setting-ip-tunnel.c:425
#, c-format
msgid "'%s' is not a valid tunnel key"
msgstr "'%s' は有効なトンネルキーではありません"
-#: ../libnm-core/nm-setting-ip-tunnel.c:416
+#: ../libnm-core/nm-setting-ip-tunnel.c:437
msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
msgstr "固定 TTL は、パス MTU 検出が有効な場合のみ許可されます"
-#: ../libnm-core/nm-setting-macsec.c:235
+#: ../libnm-core/nm-setting-ip-tunnel.c:450
+#, c-format
+msgid "some flags are invalid for the select mode: %s"
+msgstr "選択されたモードに対して一部のフラグは無効です: %s"
+
+#: ../libnm-core/nm-setting-macsec.c:252
msgid "the key is empty"
msgstr "キーが空です"
-#: ../libnm-core/nm-setting-macsec.c:246
+#: ../libnm-core/nm-setting-macsec.c:263
#, c-format
msgid "the key must be %d characters"
msgstr "キーは %d 文字にする必要があります"
-#: ../libnm-core/nm-setting-macsec.c:254
+#: ../libnm-core/nm-setting-macsec.c:271
msgid "the key contains non-hexadecimal characters"
msgstr "キーは 16 進数でない文字が含まれています"
-#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-core/nm-setting-macsec.c:308 ../libnm-core/nm-setting-vlan.c:634
#: ../libnm-util/nm-setting-vlan.c:556
#, c-format
msgid "'%s' value doesn't match '%s=%s'"
msgstr "'%s' の値は '%s=%s' と一致しません"
-#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-macsec.c:333 ../libnm-core/nm-setting-macvlan.c:177
#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
#, c-format
msgid "property is not specified and neither is '%s:%s'"
-msgstr "プロパティ、'%s:%s' いずれも指定されていません"
+msgstr "プロパティーおよび '%s:%s' のいずれも指定されていません"
-#: ../libnm-core/nm-setting-macsec.c:333
+#: ../libnm-core/nm-setting-macsec.c:350
#, c-format
msgid "EAP key management requires '%s' setting presence"
msgstr "EAP キー管理には '%s' 設定が必要です"
-#: ../libnm-core/nm-setting-macsec.c:344
+#: ../libnm-core/nm-setting-macsec.c:361
#, c-format
msgid "invalid port %d"
msgstr "無効なポート %d"
-#: ../libnm-core/nm-setting-macvlan.c:192
+#: ../libnm-core/nm-setting-macvlan.c:188
msgid "non promiscuous operation is allowed only in passthru mode"
msgstr "非プロミスキャス操作はパススルーモードでのみ許可されます"
#: ../libnm-core/nm-setting-olpc-mesh.c:130
-#: ../libnm-core/nm-setting-wireless.c:760
+#: ../libnm-core/nm-setting-wireless.c:762
#: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:778
+#: ../libnm-util/nm-setting-wireless.c:777
msgid "SSID length is out of range <1-32> bytes"
msgstr "SSID の長さは範囲外 <1-32> バイトです"
#: ../libnm-core/nm-setting-olpc-mesh.c:139
-#: ../libnm-core/nm-setting-wireless.c:800
+#: ../libnm-core/nm-setting-wireless.c:802
#: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:818
+#: ../libnm-util/nm-setting-wireless.c:817
#, c-format
msgid "'%d' is not a valid channel"
msgstr "'%d' は無効なチャンネルです"
@@ -11340,13 +11613,13 @@ msgstr "不明な ovs インターフェース設定"
msgid "Missing ovs interface type"
msgstr "不明な ovs インターフェースのタイプ"
-#: ../libnm-core/nm-setting-ovs-interface.c:271
+#: ../libnm-core/nm-setting-ovs-interface.c:270
#: ../libnm-core/nm-setting-ovs-port.c:198
#, c-format
msgid "A connection with a '%s' setting must have a master."
msgstr "'%s' 設定の接続ではマスターが必要です。"
-#: ../libnm-core/nm-setting-ovs-patch.c:110
+#: ../libnm-core/nm-setting-ovs-patch.c:106
#: ../libnm-core/nm-setting-vxlan.c:375
#, c-format
msgid "'%s' is not a valid IP address"
@@ -11382,15 +11655,15 @@ msgstr "'%s' 設定の接続では、マスターが必要ありません。"
msgid "'%s' is not allowed in fail_mode"
msgstr "'%s' は、fail_mode では利用できません。"
-#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:386
#, c-format
msgid "'%d' is out of valid range <128-16384>"
msgstr "'%d' は有効な範囲 <128-16384> の外にあります"
-#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:399
#, c-format
msgid "setting this property requires non-zero '%s' property"
-msgstr "このプロパティを設定するにはゼロ以外の '%s' プロパティーが必要です"
+msgstr "このプロパティーを設定するにはゼロ以外の '%s' プロパティーが必要です"
#: ../libnm-core/nm-setting-proxy.c:163
#, c-format
@@ -11418,74 +11691,81 @@ msgid "the script lacks FindProxyForURL function"
msgstr "スクリプトには FindProxyForURL 関数がありません"
#: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:283
-#: ../libnm-core/nm-setting-tc-config.c:547
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-tc-config.c:296
+#: ../libnm-core/nm-setting-tc-config.c:550
+#, c-format
msgid "'%s' is not a valid kind"
-msgstr "'%s' は有効なバンドではありません"
+msgstr "'%s' は有効ではありません。"
#: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:555
-#, fuzzy
+#: ../libnm-core/nm-setting-tc-config.c:558
msgid "parent handle missing"
-msgstr "データがありません"
+msgstr "親ハンドラーがありません。"
+
+#: ../libnm-core/nm-setting-tc-config.c:1201
+msgid "there are duplicate TC qdiscs"
+msgstr "複製 TC qdiscs があります"
+
+#: ../libnm-core/nm-setting-tc-config.c:1221
+msgid "there are duplicate TC filters"
+msgstr "複製 TC フィルターがあります"
#: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
#: ../libnm-core/nm-setting-team.c:266
-#, fuzzy, c-format
+#, c-format
msgid "%s is out of range [0, %d]"
-msgstr "'%s' は、[0, %u] の範囲外です"
+msgstr "%s は [0, %d] の範囲外です"
#: ../libnm-core/nm-setting-team.c:175
#, c-format
msgid "Missing target-host in nsna_ping link watcher"
-msgstr ""
+msgstr "nsna_ping リンクウォッチャーに target-host がありません"
#: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, fuzzy, c-format
+#, c-format
msgid "target-host '%s' contains invalid characters"
-msgstr "キーに無効な文字が含まれています"
+msgstr "target-host '%s' には無効な文字が含まれています。"
#: ../libnm-core/nm-setting-team.c:241
#, c-format
msgid "Missing %s in arp_ping link watcher"
-msgstr ""
+msgstr "arp_ping リンクウォッチャーに %s がありません"
#: ../libnm-core/nm-setting-team.c:254
-#, fuzzy, c-format
+#, c-format
msgid "source-host '%s' contains invalid characters"
-msgstr "キーに無効な文字が含まれています"
+msgstr "source-host '%s' に無効な文字が含まれています"
#: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:381
+#: ../libnm-core/nm-setting-team-port.c:380
#, c-format
msgid "team config exceeds size limit"
msgstr "team 設定が制限サイズを超えています"
-#: ../libnm-core/nm-setting-team.c:1178
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1179
+#, c-format
msgid "invalid runner \"%s\""
-msgstr "無効なプレフィックス %s"
+msgstr "無効なランナー \"%s\""
-#: ../libnm-core/nm-setting-team.c:1191
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1192
+#, c-format
msgid "missing link watcher name"
-msgstr "不明なファイル名"
+msgstr "リンクウォッチャー名がありません"
-#: ../libnm-core/nm-setting-team.c:1201
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1202
+#, c-format
msgid "unknown link watcher \"%s\""
-msgstr "不明な VPNプラグイン '%s'"
+msgstr "不明なリンクウォッチャー \"%s\""
-#: ../libnm-core/nm-setting-team.c:1212
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1213
+#, c-format
msgid "missing target host"
-msgstr "不明な設定"
+msgstr "ターゲットホストがありません"
-#: ../libnm-core/nm-setting-team.c:1220
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1221
+#, c-format
msgid "missing source address"
-msgstr "不明な IPv4 アドレス"
+msgstr "ソースアドレスがありません"
#: ../libnm-core/nm-setting-tun.c:187
#, c-format
@@ -11538,21 +11818,21 @@ msgstr "値が長すぎます"
msgid "value is not valid UTF8"
msgstr "値が有効な UTF-8 ではありません"
-#: ../libnm-core/nm-setting-user.c:338
+#: ../libnm-core/nm-setting-user.c:331
msgid "maximum number of user data entries reached"
msgstr "ユーザーデータエントリーが最大数に達しました"
-#: ../libnm-core/nm-setting-user.c:379
+#: ../libnm-core/nm-setting-user.c:372
#, c-format
msgid "invalid key \"%s\": %s"
msgstr "無効なキー '%s': %s"
-#: ../libnm-core/nm-setting-user.c:383
+#: ../libnm-core/nm-setting-user.c:376
#, c-format
msgid "invalid value for \"%s\": %s"
msgstr "'%s' の無効な値: %s"
-#: ../libnm-core/nm-setting-user.c:398
+#: ../libnm-core/nm-setting-user.c:391
#, c-format
msgid "maximum number of user data entries reached (%u instead of %u)"
msgstr "ユーザーデータエントリーが最大数に達しました (%u ではなく %u)"
@@ -11570,29 +11850,29 @@ msgstr "フラグが無効です"
msgid "vlan setting should have a ethernet setting as well"
msgstr "vlan 設定には Ethernet 設定も必要です"
-#: ../libnm-core/nm-setting-vpn.c:559
+#: ../libnm-core/nm-setting-vpn.c:530
#, c-format
msgid "secret was empty"
msgstr "シークレットが空です"
-#: ../libnm-core/nm-setting-vpn.c:589
+#: ../libnm-core/nm-setting-vpn.c:560
msgid "setting contained a secret with an empty name"
msgstr "設定に空の名前のシークレットが含まれていました"
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:568
#, c-format
msgid "secret value was empty"
msgstr "シークレット値が空でした"
-#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
+#: ../libnm-core/nm-setting-vpn.c:615 ../libnm-core/nm-setting.c:1786
msgid "not a secret property"
msgstr "シークレットプロパティーではありません"
-#: ../libnm-core/nm-setting-vpn.c:650
+#: ../libnm-core/nm-setting-vpn.c:621
msgid "secret is not of correct type"
msgstr "シークレットのタイプが正しくありません"
-#: ../libnm-core/nm-setting-vpn.c:681
+#: ../libnm-core/nm-setting-vpn.c:652
#, c-format
msgid "failed to convert value '%s' to uint"
msgstr "値 '%s' を uint に変換するのに失敗しました"
@@ -11607,17 +11887,17 @@ msgstr "'%s' は有効な IP%c アドレスではありません"
msgid "%d is greater than local port max %d"
msgstr "%d はローカルポートの最大 %d よりも大きいです"
-#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:612
#, c-format
msgid "'%s' is not a valid Ethernet port value"
msgstr "'%s' は有効な Ethernet ポート値ではありません"
-#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:622
#, c-format
msgid "'%s' is not a valid duplex value"
msgstr "'%s' は有効な二重値ではありません"
-#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:679
#, c-format
msgid "invalid '%s' or its value '%s'"
msgstr "無効な '%s' またはその値 '%s' です"
@@ -11630,289 +11910,292 @@ msgstr "Wake-on-LAN モードの 'default' と 'ignore' は排他的なフラグ
msgid "Wake-on-LAN password can only be used with magic packet mode"
msgstr "Wake-on-LAN パスワードは、マジックパケットモードでのみ使用できます"
-#: ../libnm-core/nm-setting-wired.c:770
-msgid "when link autonegotiation is enabled no duplex value is accepted"
-msgstr "リンク autonegotiation が有効になっていると、二重値は承認されません"
-
-#: ../libnm-core/nm-setting-wired.c:778
-msgid "when link autonegotiation is enabled speed should be 0"
-msgstr "リンク autonegotiation が有効になっている場合は、スピードは 0 にします"
+#: ../libnm-core/nm-setting-wired.c:772
+msgid "both speed and duplex should have a valid value or both should be unset"
+msgstr ""
+"速度と二重の両方の値は有効であるべきで、そうでなければ、両方とも未設定でなけ"
+"ればなりません"
-#: ../libnm-core/nm-setting-wired.c:788
+#: ../libnm-core/nm-setting-wired.c:773
msgid "both speed and duplex are required for static link configuration"
-msgstr "スピードと二重の両方が静的リンク設定に必要です"
+msgstr "速度と二重の両方が静的リンク設定に必要です"
-#: ../libnm-core/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:912
+#: ../libnm-core/nm-setting-wireless-security.c:941
+#: ../libnm-util/nm-setting-wireless-security.c:911
#, c-format
msgid "'%s' security requires '%s=%s'"
msgstr "'%s' セキュリティーには、'%s=%s' が必要です"
-#: ../libnm-core/nm-setting-wireless-security.c:942
-#: ../libnm-util/nm-setting-wireless-security.c:933
+#: ../libnm-core/nm-setting-wireless-security.c:962
+#: ../libnm-util/nm-setting-wireless-security.c:932
#, c-format
msgid "'%s' security requires '%s' setting presence"
msgstr "'%s' セキュリティーには、'%s' の設定が必要になります"
-#: ../libnm-core/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting-wireless-security.c:983
+#: ../libnm-util/nm-setting-wireless-security.c:953
#, c-format
msgid "'%d' value is out of range <0-3>"
msgstr "'%d' の値は <0-3> の範囲外になります"
-#: ../libnm-core/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1009
+#: ../libnm-core/nm-setting-wireless-security.c:1038
+#: ../libnm-util/nm-setting-wireless-security.c:1008
#, c-format
msgid "'%s' connections require '%s' in this property"
-msgstr "'%s' の接続の場合、このプロパティに '%s' が必要になります"
+msgstr "'%s' の接続の場合、このプロパティーに '%s' が必要になります"
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#: ../libnm-util/nm-setting-wireless-security.c:1039
+#: ../libnm-core/nm-setting-wireless-security.c:1068
+#: ../libnm-util/nm-setting-wireless-security.c:1038
#, c-format
msgid "'%s' can only be used with '%s=%s' (WEP)"
msgstr "'%s' は '%s=%s' (WEP) でしか使用できません"
-#: ../libnm-core/nm-setting-wireless-security.c:1072
+#: ../libnm-core/nm-setting-wireless-security.c:1092
#, c-format
msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
msgstr "'%s' は、'%s=%s' または '%s=%s' でしか使用できません"
-#: ../libnm-core/nm-setting-wireless-security.c:1094
+#: ../libnm-core/nm-setting-wireless-security.c:1114
msgid "can't be simultaneously disabled and enabled"
msgstr "同時に無効または有効にすることはできません"
-#: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:787
+#: ../libnm-core/nm-setting-wireless.c:771
+#: ../libnm-util/nm-setting-wireless.c:786
#, c-format
msgid "'%s' is not a valid Wi-Fi mode"
msgstr "'%s' は有効な Wi-Fi モードではありません"
-#: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:797
+#: ../libnm-core/nm-setting-wireless.c:781
+#: ../libnm-util/nm-setting-wireless.c:796
#, c-format
msgid "'%s' is not a valid band"
msgstr "'%s' は有効なバンドではありません"
-#: ../libnm-core/nm-setting-wireless.c:789
+#: ../libnm-core/nm-setting-wireless.c:791
#, c-format
msgid "'%s' requires setting '%s' property"
msgstr "'%s' の場合は、'%s' プロパティーを設定する必要があります"
-#: ../libnm-core/nm-setting-wireless.c:883
+#: ../libnm-core/nm-setting-wireless.c:885
#, c-format
msgid "invalid value"
msgstr "無効な値"
+#: ../libnm-core/nm-setting-wireless.c:895
+msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
+msgstr "Wake-on-WLAN モードの 'default' と 'ignore' は排他的なフラグです"
+
#: ../libnm-core/nm-setting-wireless.c:904
+msgid "Wake-on-WLAN trying to set unknown flag"
+msgstr "Wake-on-WLAN は、未知のフラグの設定を試みています"
+
+#: ../libnm-core/nm-setting-wireless.c:926
#, c-format
msgid "conflicting value of mac-address-randomization and cloned-mac-address"
msgstr "mac-address-randomization と cloned-mac-address の値の競合"
-#: ../libnm-core/nm-setting.c:821
+#: ../libnm-core/nm-setting.c:819
#, c-format
msgid "duplicate property"
msgstr "重複するプロパティー"
-#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:847 ../libnm-core/nm-setting.c:894
#, c-format
msgid "can't set property of type '%s' from value of type '%s'"
msgstr "タイプ '%s' のプロパティーをタイプ '%s' の値から設定できません"
-#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
+#: ../libnm-core/nm-setting.c:866 ../libnm-core/nm-setting.c:880
#, c-format
msgid "failed to set property: %s"
msgstr "プロパティーの設定に失敗しました: %s"
-#: ../libnm-core/nm-setting.c:910
+#: ../libnm-core/nm-setting.c:908
#, c-format
msgid "can not set property: %s"
msgstr "プロパティーを設定できません: %s"
-#: ../libnm-core/nm-setting.c:926
+#: ../libnm-core/nm-setting.c:924
#, c-format
msgid "unknown property"
msgstr "不明なプロパティー"
-#: ../libnm-core/nm-setting.c:1686
+#: ../libnm-core/nm-setting.c:1684
msgid "secret not found"
msgstr "シークレットが見つかりません"
-#: ../libnm-core/nm-setting.c:1778
+#: ../libnm-core/nm-setting.c:1776
msgid "secret is not set"
msgstr "シークレットが設定されていません"
-#: ../libnm-core/nm-utils.c:2123
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2168
+#, c-format
msgid "'%s' is not a valid handle."
-msgstr "'%s' は有効なバンドではありません"
+msgstr "'%s' は有効なハンドラーはありません。"
-#: ../libnm-core/nm-utils.c:2220
+#: ../libnm-core/nm-utils.c:2264
#, c-format
msgid "'%s' unexpected: parent already specified."
-msgstr ""
+msgstr "予期せぬ '%s': 親はすでに選択されています。"
-#: ../libnm-core/nm-utils.c:2236
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2280
+#, c-format
msgid "invalid handle: '%s'"
-msgstr "無効なオプション '%s'"
+msgstr "無効なハンドラー: '%s'"
-#: ../libnm-core/nm-utils.c:2258
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2302
msgid "parent not specified."
-msgstr "サービス名が指定されていません"
+msgstr "親が指定されていません。"
-#: ../libnm-core/nm-utils.c:2305
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2349
+#, c-format
msgid "unsupported qdisc option: '%s'."
-msgstr "タイプ '%s' のサポートされていない属性 '%s'"
+msgstr "サポートされていない qdisc オプション: '%s'"
-#: ../libnm-core/nm-utils.c:2421
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2465
msgid "action name missing."
-msgstr "データがありません"
+msgstr "アクション名がありません。"
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2489
+#, c-format
msgid "unsupported action option: '%s'."
-msgstr "タイプ '%s' のサポートされていない属性 '%s'"
+msgstr "サポートされていないアクションのオプション: '%s'"
-#: ../libnm-core/nm-utils.c:2583
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2627
msgid "invalid action: "
-msgstr "無効なオプション '%s'"
+msgstr "無効なアクション: "
-#: ../libnm-core/nm-utils.c:2587
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2631
+#, c-format
msgid "unsupported tfilter option: '%s'."
-msgstr "タイプ '%s' のサポートされていない属性 '%s'"
+msgstr "サポートされていない tfilter オプション: '%s'."
-#: ../libnm-core/nm-utils.c:2946
+#: ../libnm-core/nm-utils.c:2990
#, c-format
msgid "failed stat file %s: %s"
msgstr "ファイル %s に対する stat の実行に失敗しました: %s"
-#: ../libnm-core/nm-utils.c:2955
+#: ../libnm-core/nm-utils.c:2999
#, c-format
msgid "not a file (%s)"
msgstr "ファイルではありません (%s)"
-#: ../libnm-core/nm-utils.c:2966
+#: ../libnm-core/nm-utils.c:3010
#, c-format
msgid "invalid file owner %d for %s"
msgstr "%2$s の無効なファイル所有者 %1$d"
-#: ../libnm-core/nm-utils.c:2977
+#: ../libnm-core/nm-utils.c:3021
#, c-format
msgid "file permissions for %s"
msgstr "%s のファイルパーミッション"
-#: ../libnm-core/nm-utils.c:2987
+#: ../libnm-core/nm-utils.c:3031
#, c-format
msgid "reject %s"
msgstr "%s の拒否"
-#: ../libnm-core/nm-utils.c:3007
+#: ../libnm-core/nm-utils.c:3050
#, c-format
msgid "path is not absolute (%s)"
msgstr "パスが絶対パスではありません (%s)"
-#: ../libnm-core/nm-utils.c:3021
+#: ../libnm-core/nm-utils.c:3064
#, c-format
msgid "Plugin file does not exist (%s)"
msgstr "プラグインファイルが存在しません (%s)"
-#: ../libnm-core/nm-utils.c:3029
+#: ../libnm-core/nm-utils.c:3072
#, c-format
msgid "Plugin is not a valid file (%s)"
msgstr "プラグインが有効なファイルではありません (%s)"
-#: ../libnm-core/nm-utils.c:3039
+#: ../libnm-core/nm-utils.c:3082
#, c-format
msgid "libtool archives are not supported (%s)"
msgstr "libtool アーカイブはサポートされていません (%s)"
-#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
+#: ../libnm-core/nm-utils.c:3164 ../libnm-util/nm-utils.c:1794
#, c-format
msgid "Could not find \"%s\" binary"
msgstr "\"%s\" バイナリーを見つけることができませんでした"
-#: ../libnm-core/nm-utils.c:4167
+#: ../libnm-core/nm-utils.c:4181
#, c-format
msgid "not a valid ethernet MAC address for mask at position %lld"
msgstr "%lld の場所で、マスクに有効な Ethernet MAC アドレスではありません"
-#: ../libnm-core/nm-utils.c:4182
+#: ../libnm-core/nm-utils.c:4196
#, c-format
msgid "not a valid ethernet MAC address #%u at position %lld"
msgstr "%2$lld の場所で、有効な Ethernet MAC アドレス #%1$u ではありません"
-#: ../libnm-core/nm-utils.c:4218
+#: ../libnm-core/nm-utils.c:4232
msgid "interface name is too short"
msgstr "インターフェース名が短すぎます"
-#: ../libnm-core/nm-utils.c:4227
+#: ../libnm-core/nm-utils.c:4241
msgid "interface name is reserved"
msgstr "インターフェース名が予約されています"
-#: ../libnm-core/nm-utils.c:4239
+#: ../libnm-core/nm-utils.c:4253
msgid "interface name contains an invalid character"
msgstr "インターフェース名に無効な文字が含まれています"
-#: ../libnm-core/nm-utils.c:4245
+#: ../libnm-core/nm-utils.c:4259
msgid "interface name is longer than 15 characters"
msgstr "インターフェース名が 15 文字を超えています"
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:4905
+msgid "not valid utf-8"
+msgstr "utf-8 ではありません"
+
+#: ../libnm-core/nm-utils.c:4927 ../libnm-core/nm-utils.c:5395
+msgid "is not a JSON object"
+msgstr "JSON オブジェクトではありません"
+
+#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
msgid "value is NULL"
msgstr "値が NULL です"
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
msgid "value is empty"
msgstr "値が空です"
-#: ../libnm-core/nm-utils.c:5292
+#: ../libnm-core/nm-utils.c:5383
#, c-format
msgid "invalid JSON at position %d (%s)"
msgstr "%d (%s) で無効な JSON"
-#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
-msgid "is not a JSON object"
-msgstr "JSON オブジェクトではありません"
-
-#: ../libnm-core/nm-utils.c:5615
-msgid "not valid utf-8"
-msgstr "utf-8 ではありません"
-
-#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
+#: ../libnm-core/nm-utils.c:6028 ../libnm-core/nm-utils.c:6048
msgid "unterminated escape sequence"
msgstr "未終了のエスケープシーケンス"
-#: ../libnm-core/nm-utils.c:6003
+#: ../libnm-core/nm-utils.c:6073
#, c-format
msgid "unknown attribute '%s'"
msgstr "不明な属性 '%s'"
-#: ../libnm-core/nm-utils.c:6018
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6088
+#, c-format
msgid "missing key-value separator '%c' after '%s'"
-msgstr "キー/値のセパレーター '%c' がありません"
+msgstr "'%s' の後に、キー/値のセパレーター '%c' がありません"
-#: ../libnm-core/nm-utils.c:6034
+#: ../libnm-core/nm-utils.c:6104
#, c-format
msgid "invalid uint32 value '%s' for attribute '%s'"
msgstr "属性 '%s' の無効な uint32 値 '%s'"
-#: ../libnm-core/nm-utils.c:6043
+#: ../libnm-core/nm-utils.c:6113
#, c-format
msgid "invalid uint8 value '%s' for attribute '%s'"
msgstr "属性 '%s' の無効な uint8 値 '%s'"
-#: ../libnm-core/nm-utils.c:6053
+#: ../libnm-core/nm-utils.c:6123
#, c-format
msgid "invalid boolean value '%s' for attribute '%s'"
msgstr "属性 '%s' の無効なブール値 '%s'"
-#: ../libnm-core/nm-utils.c:6063
+#: ../libnm-core/nm-utils.c:6133
#, c-format
msgid "unsupported attribute '%s' of type '%s'"
msgstr "タイプ '%s' のサポートされていない属性 '%s'"
@@ -11977,73 +12260,73 @@ msgstr "競合するプラグイン (%s) が存在します (同じ %s.%s 値を
msgid "there exists a conflicting plugin with the same name (%s)"
msgstr "同じ名前 (%s) の競合するプラグインが存在します"
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:1070
#, c-format
msgid "missing \"plugin\" setting"
msgstr "不明な \"plugin\" 設定"
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:1080
#, c-format
msgid "%s: don't retry loading plugin which already failed previously"
msgstr "%s: 以前に失敗したプラグインのロードは再試行しないでください"
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:1174
msgid "missing filename to load VPN plugin info"
msgstr "VPN プラグイン情報をロードする不明なファイル名"
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:1186
msgid "missing name for VPN plugin info"
msgstr "VPN プラグイン情報の不明な名前"
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:1195
msgid "missing service for VPN plugin info"
msgstr "VPN プラグイン情報の不明なサービス"
-#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
+#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1307
msgid "Bluetooth"
msgstr "Bluetooth"
-#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
+#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1309
msgid "OLPC Mesh"
msgstr "OLPC メッシュ"
-#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
+#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1317
msgid "WiMAX"
msgstr "WiMAX"
-#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
+#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1331
msgid "ADSL"
msgstr "ADSL"
-#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
+#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1333
msgid "MACVLAN"
msgstr "MACVLAN"
-#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
+#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1335
msgid "VXLAN"
msgstr "VXLAN"
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
+#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1337
msgid "IPTunnel"
msgstr "IPTunnel"
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
+#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1339
msgid "Tun"
msgstr "Tun"
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
+#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1341
msgid "Veth"
msgstr "Veth"
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1379
msgid "Wired"
msgstr "有線"
-#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1410
msgid "PCI"
msgstr "PCI"
-#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1412
msgid "USB"
msgstr "USB"
@@ -12053,14 +12336,14 @@ msgstr "USB"
#. * "%2$s (%1$s)" if there's no grammatical way to combine
#. * the strings otherwise.
#.
-#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
#: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
#, c-format
msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
-#: ../libnm-glib/nm-remote-connection.c:149
+#: ../libnm-glib/nm-remote-connection.c:148
msgid "Disconnected by D-Bus"
msgstr "D-Bus により切断"
@@ -12084,23 +12367,23 @@ msgstr "MD5 コンテキストの初期化に失敗しました: %d。"
msgid "Couldn't convert password to UCS2: %d"
msgstr "パスワードを UCS2 に変換できません: %d"
-#: ../libnm-util/nm-setting-bluetooth.c:186
+#: ../libnm-util/nm-setting-bluetooth.c:185
#, c-format
msgid "requires '%s' or '%s' setting"
msgstr "'%s' または '%s' の設定が必要です"
-#: ../libnm-util/nm-setting-bond.c:582
+#: ../libnm-util/nm-setting-bond.c:581
#, c-format
msgid "'%s' is not a valid interface name for '%s' option"
msgstr "'%s' は、'%s' オプションの有効なインターフェース名ではありません"
-#: ../libnm-util/nm-setting-connection.c:834
+#: ../libnm-util/nm-setting-connection.c:831
#: ../libnm-util/nm-setting-infiniband.c:269
#, c-format
msgid "'%s' is not a valid interface name"
msgstr "'%s' は有効なインターフェース名ではありません"
-#: ../libnm-util/nm-setting-connection.c:862
+#: ../libnm-util/nm-setting-connection.c:859
#, c-format
msgid "requires presence of '%s' setting in the connection"
msgstr "接続には '%s' 設定が必要です"
@@ -12120,37 +12403,37 @@ msgid "%d. IPv4 address has invalid prefix"
msgstr "%d. IPv4 に無効なプレフィックスがあります"
#: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:939
+#: ../libnm-util/nm-setting-ip6-config.c:937
#, c-format
msgid "%d. route has invalid prefix"
msgstr "%d. ルートに無効なプレフィックスがあります"
-#: ../libnm-util/nm-setting-ip6-config.c:913
+#: ../libnm-util/nm-setting-ip6-config.c:911
#, c-format
msgid "%d. IPv6 address is invalid"
msgstr "%d. IPv6 アドレスは無効です"
-#: ../libnm-util/nm-setting-ip6-config.c:923
+#: ../libnm-util/nm-setting-ip6-config.c:921
#, c-format
msgid "%d. IPv6 address has invalid prefix"
msgstr "%d. IPv6 アドレスのプレフィックスが無効です"
-#: ../libnm-util/nm-setting-vpn.c:582
+#: ../libnm-util/nm-setting-vpn.c:581
#, c-format
msgid "Failed to convert '%s' value '%s' to uint"
msgstr "'%s' 値 '%s' を uint に変換するのに失敗しました"
-#: ../libnm-util/nm-setting-vpn.c:589
+#: ../libnm-util/nm-setting-vpn.c:588
#, c-format
msgid "Secret flags property '%s' not found"
msgstr "シークレットフラグプロパティー '%s' が見つかりません"
-#: ../libnm-util/nm-setting-wireless.c:807
+#: ../libnm-util/nm-setting-wireless.c:806
#, c-format
msgid "requires setting '%s' property"
-msgstr "'%s' プロパティの設定が必要です"
+msgstr "'%s' プロパティーの設定が必要です"
-#: ../libnm/nm-device-adsl.c:73
+#: ../libnm/nm-device-adsl.c:72
msgid "The connection was not an ADSL connection."
msgstr "接続は、ADSL 接続ではありませんでした。"
@@ -12238,21 +12521,21 @@ msgstr "デバイスと接続のモードが一致しませんでした"
msgid "The connection was not an InfiniBand connection."
msgstr "接続は InfiniBand 接続ではありませんでした。"
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
#: ../libnm/nm-device-wimax.c:324
msgid "Invalid device MAC address."
msgstr "無効なデバイス MAC アドレスです。"
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
#: ../libnm/nm-device-wimax.c:331
msgid "The MACs of the device and the connection didn't match."
msgstr "デバイスと接続の MAC アドレスが一致しませんでした。"
-#: ../libnm/nm-device-ip-tunnel.c:253
+#: ../libnm/nm-device-ip-tunnel.c:271
msgid "The connection was not an IP tunnel connection."
msgstr "接続は IP トンネル接続ではありませんでした。"
-#: ../libnm/nm-device-macvlan.c:158
+#: ../libnm/nm-device-macvlan.c:157
msgid "The connection was not a MAC-VLAN connection."
msgstr "接続は MAC-VLAN 接続ではありませんでした。"
@@ -12308,15 +12591,15 @@ msgstr "接続は VXLAN 接続ではありませんでした。"
msgid "The VXLAN identifiers of the device and the connection didn't match."
msgstr "デバイスと接続の VXLAN ID が一致しませんでした。"
-#: ../libnm/nm-device-wifi.c:590
+#: ../libnm/nm-device-wifi.c:616
msgid "The connection was not a Wi-Fi connection."
msgstr "接続は Wi-Fi 接続ではありませんでした。"
-#: ../libnm/nm-device-wifi.c:626
+#: ../libnm/nm-device-wifi.c:652
msgid "The device is lacking WPA capabilities required by the connection."
msgstr "デバイスには接続に必要な WPA 機能がありません。"
-#: ../libnm/nm-device-wifi.c:633
+#: ../libnm/nm-device-wifi.c:659
msgid "The device is lacking WPA2/RSN capabilities required by the connection."
msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません。"
@@ -12324,46 +12607,45 @@ msgstr "デバイスには接続に必要な WPA2/RSN 機能がありません
msgid "The connection was not a WiMAX connection."
msgstr "接続は WiMAX 接続ではありませんでした。"
-#: ../libnm/nm-device.c:1529
-msgid "OpenVSwitch Interface"
-msgstr "OpenVSwitch インターフェース"
+#: ../libnm/nm-device.c:1311
+msgid "Open vSwitch Interface"
+msgstr "Open vSwitch インターフェース"
-#: ../libnm/nm-device.c:1531
-msgid "OpenVSwitch Port"
-msgstr "OpenVSwitch ポート"
+#: ../libnm/nm-device.c:1313
+msgid "Open vSwitch Port"
+msgstr "Open vSwitch ポート"
-#: ../libnm/nm-device.c:1533
-msgid "OpenVSwitch Bridge"
-msgstr "OpenVSwitch ブリッジ"
+#: ../libnm/nm-device.c:1315
+msgid "Open vSwitch Bridge"
+msgstr "Open vSwitch ブリッジ"
-#: ../libnm/nm-device.c:1561
+#: ../libnm/nm-device.c:1343
msgid "MACsec"
msgstr "MACsec"
-#: ../libnm/nm-device.c:1563
+#: ../libnm/nm-device.c:1345
msgid "Dummy"
msgstr "ダミー"
-#: ../libnm/nm-device.c:1565
+#: ../libnm/nm-device.c:1347
msgid "PPP"
msgstr "PPP"
-#: ../libnm/nm-device.c:2456
+#: ../libnm/nm-device.c:2463
#, c-format
msgid "The connection was not valid: %s"
msgstr "接続は有効ではありませんでした: %s"
-#: ../libnm/nm-device.c:2465
+#: ../libnm/nm-device.c:2472
#, c-format
msgid "The interface names of the device and the connection didn't match."
msgstr "デバイスと接続のインターフェース名が一致しませんでした。"
#: ../libnm/nm-manager.c:274
-#, fuzzy
msgid "Checkpoint was removed before it was initialized"
-msgstr "接続が初期化前に削除されました"
+msgstr "チェックポイントが初期化前に削除されました"
-#: ../libnm/nm-manager.c:941
+#: ../libnm/nm-manager.c:955
msgid "Active connection removed before it was initialized"
msgstr "アクティブな接続が初期化前に削除されました"
@@ -12371,7 +12653,7 @@ msgstr "アクティブな接続が初期化前に削除されました"
msgid "Connection removed before it was initialized"
msgstr "接続が初期化前に削除されました"
-#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
+#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1012
msgid "No service name specified"
msgstr "サービス名が指定されていません"
@@ -12525,19 +12807,19 @@ msgstr "接続確認を有効または無効にする"
msgid "System policy prevents enabling or disabling connectivity checking"
msgstr "システムポリシーにより、接続確認を有効化または無効化できません"
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: ../shared/nm-utils/nm-shared-utils.c:946
#, c-format
msgid "object class '%s' has no property named '%s'"
msgstr ""
"オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: ../shared/nm-utils/nm-shared-utils.c:953
#, c-format
msgid "property '%s' of object class '%s' is not writable"
msgstr ""
"プロパティー '%s' (オブジェクトクラス '%s') が書き込み可能ではありません"
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: ../shared/nm-utils/nm-shared-utils.c:960
#, c-format
msgid ""
"construct property \"%s\" for object '%s' can't be set after construction"
@@ -12545,19 +12827,19 @@ msgstr ""
"コンストラクトプロパティー \"%s\" (オブジェクト '%s') は構築後に設定できませ"
"ん"
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: ../shared/nm-utils/nm-shared-utils.c:968
#, c-format
msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
msgstr ""
"'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
"ありません"
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: ../shared/nm-utils/nm-shared-utils.c:977
#, c-format
msgid "unable to set property '%s' of type '%s' from value of type '%s'"
msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: ../shared/nm-utils/nm-shared-utils.c:988
#, c-format
msgid ""
"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -12570,49 +12852,49 @@ 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:112
+#: ../src/NetworkManagerUtils.c:119
#, c-format
msgctxt "connection id fallback"
-msgid "%s %d"
-msgstr "%s %d"
+msgid "%s %u"
+msgstr "%s %u"
-#: ../src/main.c:179 ../src/main.c:318
+#: ../src/main.c:181 ../src/main.c:315
#, c-format
msgid "Failed to read configuration: %s\n"
msgstr "設定の読み込みに失敗しました: %s\n"
#. Logging/debugging
-#: ../src/main.c:193 ../src/nm-iface-helper.c:292
+#: ../src/main.c:195 ../src/nm-iface-helper.c:297
msgid "Print NetworkManager version and exit"
msgstr "NetworkManager のバージョンを表示して終了する"
-#: ../src/main.c:194 ../src/nm-iface-helper.c:293
+#: ../src/main.c:196 ../src/nm-iface-helper.c:298
msgid "Don't become a daemon"
msgstr "デーモンにしない"
-#: ../src/main.c:195 ../src/nm-iface-helper.c:295
+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
#, c-format
msgid "Log level: one of [%s]"
msgstr "ログレベル: [%s] のいずれか"
-#: ../src/main.c:197 ../src/nm-iface-helper.c:297
+#: ../src/main.c:199 ../src/nm-iface-helper.c:302
#, c-format
msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "「,」で区切ったログドメイン: [%s] の組み合わせ"
+msgstr "',' で区切ったログドメイン: [%s] の組み合わせ"
-#: ../src/main.c:199 ../src/nm-iface-helper.c:299
+#: ../src/main.c:201 ../src/nm-iface-helper.c:304
msgid "Make all warnings fatal"
msgstr "すべての警告を致命的にする"
-#: ../src/main.c:200
+#: ../src/main.c:202
msgid "Specify the location of a PID file"
msgstr "PID ファイルの場所を指定する"
-#: ../src/main.c:202
+#: ../src/main.c:204
msgid "Print NetworkManager configuration and exit"
msgstr "NetworkManager の設定を表示して終了する"
-#: ../src/main.c:212
+#: ../src/main.c:214
msgid ""
"NetworkManager monitors all network connections and automatically\n"
"chooses the best connection to use. It also allows the user to\n"
@@ -12624,27 +12906,12 @@ msgstr ""
"ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
"ユーザーによる指定も許可されます。"
-#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
+#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr "%s --help を使用して有効なオプションの一覧を確認してください。\n"
-#: ../src/main.c:308 ../src/nm-iface-helper.c:403
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
-
-#: ../src/main.c:333
-#, c-format
-msgid "Error in configuration file: %s.\n"
-msgstr "設定ファイルにエラーが発生しました: %s\n"
-
-#: ../src/main.c:338
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "設定ファイルにある未認識のログドメイン '%s' を無視します。\n"
-
-#: ../src/main.c:349 ../src/nm-iface-helper.c:413
+#: ../src/main.c:340 ../src/nm-iface-helper.c:457
#, c-format
msgid "Could not daemonize: %s [error %u]\n"
msgstr "デーモン化できませんでした: %s [エラー %u]\n"
@@ -12679,11 +12946,11 @@ msgstr "%s はすでに実行中です (pid %ld)\n"
msgid "You must be root to run %s!\n"
msgstr "%s を実行するには root になる必要があります!\n"
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:283
msgid "# Created by NetworkManager\n"
msgstr "# NetworkManager で作成されています\n"
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:293
#, c-format
msgid ""
"# Merged from %s\n"
@@ -12697,64 +12964,64 @@ msgstr ""
msgid "%s Network"
msgstr "%s ネットワーク"
-#: ../src/devices/bluetooth/nm-device-bt.c:264
+#: ../src/devices/bluetooth/nm-device-bt.c:262
msgid "PAN requested, but Bluetooth device does not support NAP"
msgstr "PAN が要求されましたが、Bluetooth デバイスは NAP をサポートしません"
-#: ../src/devices/bluetooth/nm-device-bt.c:274
+#: ../src/devices/bluetooth/nm-device-bt.c:272
msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
msgstr "PAN 接続は、GSM、CDMA、またはシリアル設定を指定できません"
-#: ../src/devices/bluetooth/nm-device-bt.c:287
+#: ../src/devices/bluetooth/nm-device-bt.c:285
msgid "PAN connection"
msgstr "PAN 接続"
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:292
msgid "DUN requested, but Bluetooth device does not support DUN"
msgstr "DUN が要求されましたが、Bluetooth デバイスは DUN をサポートしません"
-#: ../src/devices/bluetooth/nm-device-bt.c:304
+#: ../src/devices/bluetooth/nm-device-bt.c:302
msgid "DUN connection must include a GSM or CDMA setting"
msgstr "DUN 接続には、GSM または CDMA 設定が含まれる必要があります"
-#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/bluetooth/nm-device-bt.c:312
#: ../src/devices/wwan/nm-modem-broadband.c:709
msgid "GSM connection"
msgstr "GSM 接続"
-#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/bluetooth/nm-device-bt.c:316
#: ../src/devices/wwan/nm-modem-broadband.c:733
msgid "CDMA connection"
msgstr "CDMA 接続"
-#: ../src/devices/bluetooth/nm-device-bt.c:326
+#: ../src/devices/bluetooth/nm-device-bt.c:324
msgid "Unknown/unhandled Bluetooth connection type"
msgstr "不明な/未処理の Bluetooth 接続タイプ"
-#: ../src/devices/bluetooth/nm-device-bt.c:347
-#: ../src/devices/nm-device-ethernet.c:1408
-#: ../src/devices/nm-device-infiniband.c:210
-#: ../src/devices/wifi/nm-device-wifi.c:952
+#: ../src/devices/bluetooth/nm-device-bt.c:345
+#: ../src/devices/nm-device-ethernet.c:1413
+#: ../src/devices/nm-device-infiniband.c:190
+#: ../src/devices/wifi/nm-device-wifi.c:872
msgid "connection does not match device"
msgstr "接続がデバイスに一致しません"
-#: ../src/devices/nm-device-bond.c:91
+#: ../src/devices/nm-device-bond.c:89
msgid "Bond connection"
msgstr "ボンド接続"
-#: ../src/devices/nm-device-bridge.c:130
+#: ../src/devices/nm-device-bridge.c:128
msgid "Bridge connection"
msgstr "ブリッジ接続"
-#: ../src/devices/nm-device-dummy.c:70
+#: ../src/devices/nm-device-dummy.c:68
msgid "Dummy connection"
msgstr "ダミー接続"
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1394
msgid "PPPoE connection"
msgstr "PPPoE 接続"
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1394
msgid "Wired connection"
msgstr "有線接続"
@@ -12763,27 +13030,27 @@ msgstr "有線接続"
msgid "Wired connection %d"
msgstr "有線接続 %d"
-#: ../src/devices/nm-device-ip-tunnel.c:340
+#: ../src/devices/nm-device-ip-tunnel.c:371
msgid "IP tunnel connection"
msgstr "IP トンネル接続"
-#: ../src/devices/nm-device-macvlan.c:344
+#: ../src/devices/nm-device-macvlan.c:347
msgid "MACVLAN connection"
msgstr "MACVLAN 接続"
-#: ../src/devices/nm-device-tun.c:146
+#: ../src/devices/nm-device-tun.c:158
msgid "TUN connection"
msgstr "TUN 接続"
-#: ../src/devices/team/nm-device-team.c:119
+#: ../src/devices/team/nm-device-team.c:117
msgid "Team connection"
msgstr "team 接続"
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:147
msgid "Mesh"
msgstr "メッシュ"
-#: ../src/devices/wifi/nm-device-wifi.c:919
+#: ../src/devices/wifi/nm-device-wifi.c:839
msgid "WPA Ad-Hoc disabled due to kernel bugs"
msgstr "WPA アドホックはカーネルバグのため無効になりました"
@@ -12948,133 +13215,133 @@ msgstr "AP セキュリティー情報の決定に失敗しました。"
msgid "GSM mobile broadband connection requires a 'gsm' setting"
msgstr "GSM モバイルブロードバンド接続には 'gsm' 設定が必要です"
-#: ../src/nm-config.c:486
+#: ../src/nm-config.c:521
msgid "Config file location"
msgstr "設定ファイルの場所"
-#: ../src/nm-config.c:487
+#: ../src/nm-config.c:522
msgid "Config directory location"
msgstr "設定ディレクトリの場所"
-#: ../src/nm-config.c:488
+#: ../src/nm-config.c:523
msgid "System config directory location"
msgstr "システム設定ディレクトリーの場所"
-#: ../src/nm-config.c:489
+#: ../src/nm-config.c:524
msgid "Internal config file location"
msgstr "内部設定ファイルの場所"
-#: ../src/nm-config.c:490
+#: ../src/nm-config.c:525
msgid "State file location"
msgstr "状態ファイルの場所"
-#: ../src/nm-config.c:491
+#: ../src/nm-config.c:526
msgid "State file for no-auto-default devices"
msgstr "no-auto-default デバイスの状態ファイル"
-#: ../src/nm-config.c:492
+#: ../src/nm-config.c:527
msgid "List of plugins separated by ','"
-msgstr "複数のプラグインを「,」で区切った一覧"
+msgstr "複数のプラグインを ',' で区切った一覧"
-#: ../src/nm-config.c:493
+#: ../src/nm-config.c:528
msgid "Quit after initial configuration"
msgstr "初期設定後に終了する"
-#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
msgid "Don't become a daemon, and log to stderr"
msgstr "デーモンにせず、stderr にログ記録する"
#. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:497
+#: ../src/nm-config.c:532
msgid "An http(s) address for checking internet connectivity"
msgstr "インターネットの接続性を確認するための http(s) アドレス"
-#: ../src/nm-config.c:498
+#: ../src/nm-config.c:533
msgid "The interval between connectivity checks (in seconds)"
msgstr "接続性チェックの間隔 (秒単位)"
-#: ../src/nm-config.c:499
+#: ../src/nm-config.c:534
msgid "The expected start of the response"
msgstr "期待されている応答の開始点"
#. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:279
msgid "The interface to manage"
msgstr "管理するインターフェース"
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:280
msgid "Connection UUID"
msgstr "接続 UUID"
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:281
msgid "Connection Token for Stable IDs"
msgstr "安定 ID の接続トークン"
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:282
msgid "Whether to manage IPv6 SLAAC"
msgstr "IPv6 SLAAC を管理するかどうか"
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:283
msgid "Whether SLAAC must be successful"
msgstr "SLAAC が成功する必要があるかどうか"
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:284
msgid "Use an IPv6 temporary privacy address"
msgstr "IPv6 一時プライバシーアドレスの使用"
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:285
msgid "Current DHCPv4 address"
msgstr "現在の DHCPv4 アドレス"
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:286
msgid "Whether DHCPv4 must be successful"
msgstr "DHCPv4 が成功する必要があるかどうか"
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:287
msgid "Hex-encoded DHCPv4 client ID"
msgstr "16 進エンコードされた DHCPv4 クライアント ID"
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
msgid "Hostname to send to DHCP server"
msgstr "DHCP サーバーに送信するホスト名"
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
msgid "barbar"
msgstr "barbar"
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
msgid "FQDN to send to DHCP server"
msgstr "DHCP サーバーに送信する FQDN"
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
msgid "host.domain.org"
msgstr "host.domain.org"
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
msgid "Route priority for IPv4"
msgstr "IPv4 のルート優先度"
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
msgid "0"
msgstr "0"
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
msgid "Route priority for IPv6"
msgstr "IPv6 のルート優先度"
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
msgid "1024"
msgstr "1024"
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:292
msgid "Hex-encoded Interface Identifier"
msgstr "16 進エンコードされたインターフェース ID"
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:293
msgid "IPv6 SLAAC address generation mode"
msgstr "IPv6 SLAAC アドレス生成モード"
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:294
msgid ""
"The logging backend configuration value. See logging.backend in "
"NetworkManager.conf"
@@ -13082,7 +13349,7 @@ msgstr ""
"ロギングバックエンド設定値。NetworkManager.conf の logging.backend を参照して"
"ください"
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:314
msgid ""
"nm-iface-helper is a small, standalone process that manages a single network "
"interface."
@@ -13090,27 +13357,37 @@ msgstr ""
"nm-iface-helper は、単一のネットワークインターフェースを管理する小さいスタン"
"ドアロンプロセスです。"
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:423
#, c-format
msgid "An interface name and UUID are required\n"
msgstr "インターフェース名と UUID が’必要です\n"
-#: ../src/nm-iface-helper.c:385
+#: ../src/nm-iface-helper.c:429
#, c-format
msgid "Failed to find interface index for %s (%s)\n"
msgstr "%s (%s) のインターフェースインデックスの検出に失敗しました\n"
-#: ../src/nm-iface-helper.c:446
+#: ../src/nm-iface-helper.c:447
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr "コマンドラインに渡された未認識のログドメイン '%s' を無視します。\n"
+
+#: ../src/nm-iface-helper.c:486
#, c-format
msgid "(%s): Invalid IID %s\n"
msgstr "(%s): 無効な IID %s\n"
-#: ../src/nm-logging.c:267
+#: ../src/nm-iface-helper.c:497
+#, c-format
+msgid "(%s): Invalid DHCP client-id %s\n"
+msgstr "(%s): 無効な DHCP client-id %s\n"
+
+#: ../src/nm-logging.c:273
#, c-format
msgid "Unknown log level '%s'"
msgstr "不明なログレベル '%s'"
-#: ../src/nm-logging.c:369
+#: ../src/nm-logging.c:375
#, c-format
msgid "Unknown log domain '%s'"
msgstr "不明なログドメイン '%s'"
--
2.17.1
From d09bde0084d8c202fd1aef887eb5677e667345bb Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sun, 19 Aug 2018 13:06:56 +0200
Subject: [PATCH 3/3] ip4-config: fix a typo
Reported by the Red Hat translators.
---
clients/common/settings-docs.h | 2 +-
clients/common/settings-docs.h.in | 2 +-
docs/api/html/nm-settings.html | 4 ++--
docs/api/html/settings-ipv4.html | 4 ++--
docs/api/settings-spec.xml | 2 +-
docs/libnm/html/NMSettingIP4Config.html | 4 ++--
libnm-core/nm-setting-ip4-config.c | 2 +-
libnm/nm-property-docs.xml | 2 +-
libnm/nm-settings-docs.xml | 2 +-
man/nm-settings.5 | 2 +-
man/nm-settings.xml | 2 +-
po/ja.po | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 5aca99e..7499945 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -212,7 +212,7 @@
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 722b55a..ca63e9b 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -1385,7 +1385,7 @@
<a name="nm-settings.property.ipv4.dhcp-client-id"></a>dhcp-client-id</td>
<td align="left">string</td>
<td align="left"> </td>
-<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
+<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
</tr>
<tr>
<td align="left">
@@ -3761,4 +3761,4 @@
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index 08a6ec7..9d5da21 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -75,7 +75,7 @@
<td><pre class="screen">dhcp-client-id</pre></td>
<td><pre class="screen">string</pre></td>
<td><pre class="screen"></pre></td>
-<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
+<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
</tr>
<tr>
<td><pre class="screen">dhcp-fqdn</pre></td>
@@ -200,4 +200,4 @@
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 703871e..271313f 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -199,7 +199,7 @@
<row><entry><screen>address-data<indexterm zone="settings-ipv4"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry>Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row>
<row><entry><screen>addresses<indexterm zone="settings-ipv4"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen>[]</screen></entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv4 address structures. Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.</entry></row>
<row><entry><screen>dad-timeout<indexterm zone="settings-ipv4"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.</entry></row>
- <row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
+ <row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
<row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row>
<row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row>
<row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row>
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index bde2d93..2c70d9e 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -321,7 +321,7 @@ If the property is not a hex string it is considered as a
non-hardware-address client ID and the 'type' field is set to 0.</p>
<p>The special values "mac" and "perm-mac" are supported, which use the
current or permanent MAC address of the device to generate a client identifier
-with type ethernet type (01). Currently, these options only work for ethernet
+with type ethernet (01). Currently, these options only work for ethernet
type of links.</p>
<p>The special value "stable" is supported to generate a type 0 client identifier based
on the stable-id (see connection.stable-id) and a per-host key.</p>
@@ -347,4 +347,4 @@ cannot be set at the same time.</p>
<div class="footer">
<hr>Generated by GTK-Doc V1.28</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 0c668d8..d855ccb 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -721,7 +721,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class)
*
* The special values "mac" and "perm-mac" are supported, which use the
* current or permanent MAC address of the device to generate a client identifier
- * with type ethernet type (01). Currently, these options only work for ethernet
+ * with type ethernet (01). Currently, these options only work for ethernet
* type of links.
*
* The special value "stable" is supported to generate a type 0 client identifier based
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 8c1694f..afc850b 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -1765,7 +1765,7 @@ string
T}:T{
\ \&
T}:T{
-A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01)\&. Currently, these options only work for ethernet type of links\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If unset, a globally configured default is used\&. If still unset, the client\-id from the last lease is reused\&.
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01)\&. Currently, these options only work for ethernet type of links\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If unset, a globally configured default is used\&. If still unset, the client\-id from the last lease is reused\&.
T}
T{
dhcp\-fqdn
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 5ea5f39..9917061 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -203,7 +203,7 @@
<row><entry align="left" id="nm-settings.property.ipv4.address-data">address-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row>
<row><entry align="left" id="nm-settings.property.ipv4.addresses">addresses</entry><entry align="left">array of array of uint32</entry><entry align="left">[]</entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv4 address structures. Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.</entry></row>
<row><entry align="left" id="nm-settings.property.ipv4.dad-timeout">dad-timeout</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.</entry></row>
- <row><entry align="left" id="nm-settings.property.ipv4.dhcp-client-id">dhcp-client-id</entry><entry align="left">string</entry><entry align="left"/><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
+ <row><entry align="left" id="nm-settings.property.ipv4.dhcp-client-id">dhcp-client-id</entry><entry align="left">string</entry><entry align="left"/><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
<row><entry align="left" id="nm-settings.property.ipv4.dhcp-fqdn">dhcp-fqdn</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row>
<row><entry align="left" id="nm-settings.property.ipv4.dhcp-hostname">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row>
<row><entry align="left" id="nm-settings.property.ipv4.dhcp-send-hostname">dhcp-send-hostname</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row>
diff --git a/po/ja.po b/po/ja.po
index 35f9c7c..c3c3dc9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8163,7 +8163,7 @@ msgid ""
"hardware-address client ID and the 'type' field is set to 0. The special "
"values \"mac\" and \"perm-mac\" are supported, which use the current or "
"permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
"type of links. The special value \"stable\" is supported to generate a type "
"0 client identifier based on the stable-id (see connection.stable-id) and a "
"per-host key. If unset, a globally configured default is used. If still "
--
2.17.1