foreman_discovery 11.0.0 → 12.0.0

data/locale/it/foreman_discovery.po

@@ -46,9 +46,6 @@ msgstr ""
 msgid "Auto Provision"
 msgstr "Auto Provision"
 
-msgid "Auto Provision All"
-msgstr "Esegui Auto Provision su tutti"
-
 msgid "Auto provisioning"
 msgstr ""
 
@@ -76,6 +73,9 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Collapse All"
+msgstr ""
+
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Impossibile ottenere gli eventi dal proxy %{url}: %{error}"
 
@@ -97,6 +97,9 @@ msgstr ""
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr "Cancella %s?"
 
@@ -106,9 +109,6 @@ msgstr "Rimuovi un host rilevato"
 msgid "Delete a rule"
 msgstr "Cancella una regola"
 
-msgid "Delete hosts"
-msgstr "Cancella gli host"
-
 msgid "Delete rule '%s'?"
 msgstr ""
 
@@ -127,6 +127,9 @@ msgstr ""
 msgid "Discovered Hosts"
 msgstr ""
 
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Host trovati: %s"
 
@@ -157,6 +160,9 @@ msgstr ""
 msgid "Discovery Rules"
 msgstr "Regola per la scoperta"
 
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
 msgid "Discovery location"
 msgstr ""
 
@@ -190,11 +196,14 @@ msgstr ""
 msgid "Disks size"
 msgstr "Dimensione dischi"
 
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
 msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
-msgid "Edit Discovery Rule"
-msgstr "Modifica la regola per la scoperta"
+msgid "Edit %s"
+msgstr ""
 
 msgid "Enable"
 msgstr "Abilita"
@@ -202,6 +211,9 @@ msgstr "Abilita"
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error on existing NIC"
+msgstr ""
+
 msgid "Errors during auto provisioning: %s"
 msgstr "Errore durante auto provisioning: %s"
 
@@ -214,9 +226,6 @@ msgstr "Esegui le regole nei confronti di un host rilevato"
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Esegui le regole nei confronti degli host attualemente rilevati"
 
-msgid "Expand All"
-msgstr "Espandi tutti"
-
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
@@ -509,9 +518,6 @@ msgstr "Esegui il provisioning di un host rilevato"
 msgid "Reboot"
 msgstr "Riavvia"
 
-msgid "Reboot All"
-msgstr ""
-
 msgid "Rebooting %s"
 msgstr "Riavvio di %s"
 
@@ -644,13 +650,10 @@ msgstr "Tipo"
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "UUID per controllare gli stati dei compiti d'orchestrazione, GET /api/orchestration/:UUID/tasks"
 
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr ""
-
-msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
+msgid "Unable to find a discovery rule, no host provided (check permissions)"
 msgstr ""
 
-msgid "Unable to find a discovery rule, no host provided (check permissions)"
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
@@ -695,6 +698,9 @@ msgstr "oggetti selezionati. Deselezionare per annullare"
 msgid "location ID for provisioned hosts"
 msgstr ""
 
+msgid "must be present."
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr "deve iniziare con una lettera o ERB."
 

data/locale/ja/foreman_discovery.edit.po

@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_discovery package.
-# 
+#
 # Translators:
 # Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 10:28+0100\n"
 "PO-Revision-Date: 2018-01-05 19:26+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/"
+")\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,23 +22,19 @@ msgstr ""
 msgid "List all discovered hosts"
 msgstr "すべての検出されたホストを一覧表示"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
 msgid "filter results"
 msgstr "結果のフィルター"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
 msgid "sort results"
 msgstr "結果のソート"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
 msgstr "結果のページネーション"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
 msgid "number of entries per request"
 msgstr "要求ごとのエントリー数"
 
@@ -46,8 +42,7 @@ msgstr "要求ごとのエントリー数"
 msgid "Show a discovered host"
 msgstr "検出されたホストの表示"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:79
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr "DHCP ファイル名オプション (デフォルトでは Grub2 または PXELinux)"
 
@@ -68,14 +63,11 @@ msgid "not required if it's a virtual machine"
 msgstr "仮想マシンの場合は不要です"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
-msgid ""
-"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "オーケストレーションタスクの状態を追跡するための UUID。GET /api/orchestration/:UUID/tasks"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
-msgid ""
-"required if value is not inherited from host group or default password in "
-"settings"
+msgid "required if value is not inherited from host group or default password in settings"
 msgstr "値がホストグループから継承されていないか、または設定済みのデフォルトパスワードである場合に必須です。"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
@@ -87,62 +79,54 @@ msgid "Upload facts for a host, creating the host if required"
 msgstr "ホストのファクトをアップロードし、必要な場合はホストを作成します"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
-msgid ""
-"hash containing facts for the host with minimum set of facts: "
-"discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
-"eth0 (example in case primary interface is named eth0)"
+msgid "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
 msgstr "ファクトの最小セットが設定されたホストのファクトを含むハッシュ : discovery_bootif、macaddress_eth0、ipaddress、ipaddress_eth0、 interfaces: eth0 (プライマリーインターフェースの名前が eth0 の場合の例)"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
 msgid "Execute rules against a discovered host"
 msgstr "検出されたホストに対するルールの実行"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:123
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122 ../app/controllers/discovered_hosts_controller.rb:159
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "ホスト %{host} がルール %{rule} でプロビジョニングされています"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "%{host} をプロビジョニングできません: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:132
-#: ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131 ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No rule found for host %s"
 msgstr "ホスト %s に対するルールは見つかりません"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:139
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
 msgid "Execute rules against all currently discovered hosts"
 msgstr "現在検出されているすべてのホストに対するルールの実行"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:143
-#: ../app/controllers/discovered_hosts_controller.rb:163
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142 ../app/controllers/discovered_hosts_controller.rb:172
 msgid "Errors during auto provisioning: %s"
 msgstr "自動プロビジョニング時のエラー: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:146
-#: ../app/controllers/discovered_hosts_controller.rb:166
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "No discovered hosts to provision"
 msgstr "プロビジョニングする検出されたホストがありません"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:168
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
 msgid "%s discovered hosts were provisioned"
 msgstr "%s 検出されたホストがプロビジョニングされました"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:179
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
 msgid "Refreshing the facts of a discovered host"
 msgstr "検出されたホストのファクトの更新中"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:188
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
 msgid "Rebooting a discovered host"
 msgstr "検出されたホストの再起動中"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:197
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
 msgid "Rebooting all discovered hosts"
 msgstr "すべての検出されたホストの再起動中"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:208
-#: ../app/controllers/discovered_hosts_controller.rb:125
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207 ../app/controllers/discovered_hosts_controller.rb:128
 msgid "Discovered hosts are rebooting now"
 msgstr "検出されたホストの再起動中"
 
@@ -167,8 +151,7 @@ msgid "the hostgroup that is used to auto provision a host"
 msgstr "ホストの自動プロビジョニングに使用されるホストグループ"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
-msgid ""
-"defines a pattern to assign human-readable hostnames to the matching hosts"
+msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr "人が判読できるホスト名を一致するホストに割り当てるパターンの定義"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -176,8 +159,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr "ルール別のプロビジョニングされたホストの最大数の制限を許可"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
-msgid ""
-"puts the rules in order, low numbers go first. Must be greater then zero"
+msgid "puts the rules in order, low numbers go first. Must be greater then zero"
 msgstr "ルールを低い数字の順に配置。ゼロより大きい値である必要があります。"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -224,95 +206,95 @@ msgstr "再起動時のエラー: %s"
 msgid "No discovered hosts to reboot"
 msgstr "再起動する検出されたホストがありません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:61
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr "%s が正常にプロビジョニングされました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:93
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Facts refreshed for %s"
 msgstr "%s について更新されたファクト"
 
-#: ../app/controllers/discovered_hosts_controller.rb:95
+#: ../app/controllers/discovered_hosts_controller.rb:98
 msgid "Failed to refresh facts for %s"
 msgstr "%s のファクトの更新に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:98
+#: ../app/controllers/discovered_hosts_controller.rb:101
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr "%{hostname} のファクトの更新に失敗し、エラー %{error_message} が発生しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:105
+#: ../app/controllers/discovered_hosts_controller.rb:108
 msgid "Host of type %s can not be rebooted"
 msgstr "タイプ %s のホストを再起動できません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Rebooting host %s"
 msgstr "ホスト %s の再起動中"
 
-#: ../app/controllers/discovered_hosts_controller.rb:111
+#: ../app/controllers/discovered_hosts_controller.rb:114
 msgid "Failed to reboot host %s"
 msgstr "ホスト %s の再起動に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:114
+#: ../app/controllers/discovered_hosts_controller.rb:117
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr "ホスト %{hostname} の再起動に失敗し、エラー %{error_message} が発生しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:128
+#: ../app/controllers/discovered_hosts_controller.rb:131
 msgid "Failed to reboot hosts with error %s"
 msgstr "ホストの再起動に失敗し、エラー %s が発生しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:140
+#: ../app/controllers/discovered_hosts_controller.rb:149
 msgid "Destroyed selected hosts"
 msgstr "破棄された選択済みホスト"
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:151
 msgid "The following hosts were not deleted: %s"
 msgstr "次のホストが削除されました: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:154
+#: ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Failed to auto provision host %s: %s"
 msgstr "ホスト %s の自動プロビジョニングに失敗しました: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:182
+#: ../app/controllers/discovered_hosts_controller.rb:191
 msgid "Discovered hosts are provisioning now"
 msgstr "検出されたホストのプロビジョニング中"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Highlights"
 msgstr "ハイライト"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Storage"
 msgstr "ストレージ"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "IPMI"
 msgstr "IPMI"
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: ../app/controllers/discovered_hosts_controller.rb:291
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "No hosts were found with that id or name"
 msgstr "該当する ID または名前のホストが見つかりませんでした"
 
-#: ../app/controllers/discovered_hosts_controller.rb:295
+#: ../app/controllers/discovered_hosts_controller.rb:305
 msgid "No hosts selected"
 msgstr "ホストが選択されていません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:301
+#: ../app/controllers/discovered_hosts_controller.rb:311
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "ホストの選択中に問題が発生しました - %s"
 
@@ -328,19 +310,15 @@ msgstr "無効にされたルール"
 msgid "%s ago"
 msgstr "%s 前"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
 msgid "Auto Provision"
 msgstr "自動プロビジョニング"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
 msgid "Refresh facts"
 msgstr "ファクトの更新"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16
-#: ../app/models/setting/discovered.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr "再起動"
 
@@ -348,62 +326,51 @@ msgstr "再起動"
 msgid "Back"
 msgstr "戻る"
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:37
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
 msgid "Select Action"
 msgstr "アクションの選択"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23
-msgid "Expand All"
-msgstr "すべて展開"
-
-#: ../app/helpers/discovered_hosts_helper.rb:27
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
 msgid "Delete %s?"
 msgstr "%s を削除しますか?"
 
-#: ../app/helpers/discovered_hosts_helper.rb:33
-msgid "Delete hosts"
-msgstr "ホストの削除"
-
-#: ../app/helpers/discovered_hosts_helper.rb:34
+#: ../app/helpers/discovered_hosts_helper.rb:31
 msgid "Assign Organization"
 msgstr "組織の割り当て"
 
-#: ../app/helpers/discovered_hosts_helper.rb:35
+#: ../app/helpers/discovered_hosts_helper.rb:32
 msgid "Assign Location"
 msgstr "場所の割り当て"
 
-#: ../app/helpers/discovered_hosts_helper.rb:39
+#: ../app/helpers/discovered_hosts_helper.rb:33
+msgid "Delete"
+msgstr ""
+
+#: ../app/helpers/discovered_hosts_helper.rb:37
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - 以下のホストはすぐに変更されます"
 
-#: ../app/helpers/discovered_hosts_helper.rb:48
-#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
+#: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
 msgstr "該当なし"
 
-#: ../app/helpers/discovered_hosts_helper.rb:60
+#: ../app/helpers/discovered_hosts_helper.rb:58
 msgid "New in the last 24 hours"
 msgstr "過去 24 時間以内の新規"
 
-#: ../app/helpers/discovered_hosts_helper.rb:64
+#: ../app/helpers/discovered_hosts_helper.rb:62
 msgid "Not reported in more than 7 days"
 msgstr "8 日以上報告なし"
 
-#: ../app/helpers/discovered_hosts_helper.rb:68
+#: ../app/helpers/discovered_hosts_helper.rb:66
 msgid "Reported in the last 7 days"
 msgstr "過去 7 日以内に報告あり"
 
-#: ../app/helpers/discovered_hosts_helper.rb:92
+#: ../app/helpers/discovered_hosts_helper.rb:90
 msgid "Provision"
 msgstr "プロビジョニング"
 
-#: ../app/helpers/discovery_rules_helper.rb:26
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
-#: ../app/views/discovered_hosts/welcome.html.erb:1
-#: ../app/views/discovered_hosts/welcome.html.erb:6
-#: ../lib/foreman_discovery/engine.rb:166
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2 ../app/views/discovered_hosts/welcome.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:6 ../lib/foreman_discovery/engine.rb:173
 msgid "Discovered Hosts"
 msgstr "検出されたホスト"
 
@@ -439,64 +406,57 @@ msgstr "メールが有効にされたユーザーを指定する必要があり
 msgid "Discovered hosts summary"
 msgstr "検出されたホストの概要"
 
-#: ../app/models/discovery_rule.rb:9
+#: ../app/models/discovery_rule.rb:10
 msgid "can't contain white spaces."
 msgstr "空白を含めることができません。"
 
-#: ../app/models/discovery_rule.rb:11
+#: ../app/models/discovery_rule.rb:12
 msgid "must start with a letter or ERB."
 msgstr "文字または ERB で開始する必要があります。"
 
-#: ../app/models/discovery_rule.rb:45
-msgid ""
-"Host group organization %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group organizations %s must also be associated to the discovery rule"
+#: ../app/models/discovery_rule.rb:15
+msgid "must be present."
+msgstr ""
+
+#: ../app/models/discovery_rule.rb:48
+msgid "Host group organization %s must also be associated to the discovery rule"
+msgid_plural "Host group organizations %s must also be associated to the discovery rule"
 msgstr[0] "ホストグループ組織 %s も検出ルールに関連付ける必要があります"
 
-#: ../app/models/discovery_rule.rb:51
+#: ../app/models/discovery_rule.rb:54
 msgid "Host group location %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group locations %s must also be associated to the discovery rule"
+msgid_plural "Host group locations %s must also be associated to the discovery rule"
 msgstr[0] "ホストグループの場所 %s も検出ルールに関連付ける必要があります"
 
-#: ../app/models/host/discovered.rb:37
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr "無効なファクトです。ハッシュである必要があります。"
 
-#: ../app/models/host/discovered.rb:42
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:56
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "予測された discovery_fact '%s' がありません。プライマリーインターフェースを検出したり、ホスト名を設定したりできません"
 
-#: ../app/models/host/discovered.rb:49
-msgid ""
-"Invalid facts: hash does not contain a valid value for any of the facts in "
-"the discovery_hostname setting: %s"
+#: ../app/models/host/discovered.rb:63
+msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr "無効なファクト: ハッシュには discovery_hostname 設定のファクトのいずれの有効な値も含まれていません: %s"
 
-#: ../app/models/host/discovered.rb:66
+#: ../app/models/host/discovered.rb:89
 msgid "Facts could not be imported"
 msgstr "ファクトをインポートできませんでした"
 
-#: ../app/models/host/discovered.rb:133
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr "サブネットを割り当てることができません。プライマリーインターフェースには IP アドレスがありません"
-
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:212
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "プロキシー %{url} からファクトを取得できませんでした: %{error}"
 
-#: ../app/models/host/discovered.rb:198
+#: ../app/models/host/discovered.rb:220
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "%{url} から %{name} を再起動できません: %{msg}"
 
-#: ../app/models/host/discovered.rb:206
+#: ../app/models/host/discovered.rb:228
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "%{url} から kexec を %{name} に対して実行できません: %{msg}"
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:247
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "無効なホスト名: ホスト名を正規化できませんでした"
 
@@ -549,9 +509,7 @@ msgid "Hostname facts"
 msgstr "ホスト名ファクト"
 
 #: ../app/models/setting/discovered.rb:22
-msgid ""
-"Automatically provision newly discovered hosts, according to the "
-"provisioning rules"
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr "プロビジョニングルールに基づく新たに検出されたホストの自動プロビジョニング"
 
 #: ../app/models/setting/discovered.rb:22
@@ -627,9 +585,7 @@ msgid "IPMI facts"
 msgstr "IPMI ファクト"
 
 #: ../app/models/setting/discovered.rb:32
-msgid ""
-"Automatically generate PXE configuration to pin a newly discovered host to "
-"discovery"
+msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr "新規に検出されたホストを検出に固定するための PXE 設定の自動生成"
 
 #: ../app/models/setting/discovered.rb:32
@@ -668,27 +624,41 @@ msgstr "検出されたホストのプロビジョニング時の DNS エント
 msgid "Force DNS"
 msgstr "DNS  の強制的な実行"
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:37
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:37
+msgid "Error on existing NIC"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:44
 msgid "The default location to place discovered hosts in"
 msgstr "検出されたホストを配置するデフォルトの場所"
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:44
 msgid "Discovery location"
 msgstr "検出ロケーション"
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "The default organization to place discovered hosts in"
 msgstr "検出されたホストを配置するデフォルトの組織"
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "Discovery organization"
 msgstr "検出組織"
 
-#: ../app/services/foreman_discovery/fact_parser.rb:9
-msgid ""
-"Unable to detect primary interface using MAC '%{mac}' specified by "
-"discovery_fact '%{fact}'"
-msgstr "discovery_fact '%{fact}' で指定された MAC '%{mac}' を使用してプライマリーインターフェースを検出できません"
+#: ../app/services/foreman_discovery/fact_parser.rb:4
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:6
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:12
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
+msgstr ""
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
 msgid "Image API returned HTTP/%{code} with '%{body}"
@@ -706,25 +676,15 @@ msgstr "検出されたホストがありません"
 msgid "Host"
 msgstr "ホスト"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:18
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:10
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
 msgid "Model"
 msgstr "モデル"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:20
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:12
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
 msgid "CPUs"
 msgstr "CPU"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:21
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:13
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
 msgid "Memory"
 msgstr "メモリー"
 
@@ -744,16 +704,11 @@ msgstr "このページのすべての項目を選択"
 msgid "items selected. Uncheck to Clear"
 msgstr "項目が選択されています。クリアするにはチェックを解除してください"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:17
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
 msgid "Name"
 msgstr "名前"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:19
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
 msgid "IP Address"
 msgstr "IP アドレス"
 
@@ -765,13 +720,11 @@ msgstr "ディスク数"
 msgid "Disks Size"
 msgstr "ディスクサイズ"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Location"
 msgstr "場所"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovered_hosts/_selected_hosts.html.erb:13
 msgid "Organization"
 msgstr "組織"
 
@@ -799,18 +752,8 @@ msgstr "送信"
 msgid "Provision %s"
 msgstr "%s のプロビジョニング"
 
-#: ../app/views/discovered_hosts/index.html.erb:2
-msgid "Reboot All"
-msgstr "すべてを再起動"
-
-#: ../app/views/discovered_hosts/index.html.erb:3
-msgid "Auto Provision All"
-msgstr "すべてを自動プロビジョニング"
-
 #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
-msgid ""
-"This might take a while, as all hosts, facts and reports will be destroyed "
-"as well"
+msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "ホスト、ファクト、およびレポートもすべて破棄されるため、時間がかかる場合があります。"
 
 #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -825,34 +768,36 @@ msgstr "組織の選択"
 msgid "Discovered host: %s"
 msgstr "検出されたホスト: %s"
 
-#: ../app/views/discovered_hosts/show.html.erb:34
+#: ../app/views/discovered_hosts/show.html.erb:37
 msgid "Interfaces"
 msgstr "インターフェース"
 
-#: ../app/views/discovered_hosts/show.html.erb:41
+#: ../app/views/discovered_hosts/show.html.erb:44
 msgid "Type"
 msgstr "タイプ"
 
-#: ../app/views/discovered_hosts/show.html.erb:42
+#: ../app/views/discovered_hosts/show.html.erb:45
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../app/views/discovered_hosts/show.html.erb:43
+#: ../app/views/discovered_hosts/show.html.erb:46
 msgid "MAC address"
 msgstr "MAC アドレス"
 
-#: ../app/views/discovered_hosts/show.html.erb:44
+#: ../app/views/discovered_hosts/show.html.erb:47
 msgid "IP address"
 msgstr "IP アドレス"
 
+#: ../app/views/discovered_hosts/show.html.erb:66
+msgid "Collapse All"
+msgstr ""
+
 #: ../app/views/discovered_hosts/welcome.html.erb:7
 msgid "No discovered hosts found in this context."
 msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:8
-msgid ""
-"This page shows discovered bare-metal or virtual nodes waiting to be "
-"provisioned."
+msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
@@ -867,23 +812,19 @@ msgstr "Foreman の検出されたホストの概要レポート"
 msgid "<b>Foreman</b> Discovered hosts summary"
 msgstr "<b>Foreman</b> の検出されたホストの概要"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:10 ../app/views/discovered_mailer/discovered_summary.text.erb:5
 msgid "Summary from %{time} ago to %{now}"
 msgstr "%{time} から %{now} までの概要"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:11 ../app/views/discovered_mailer/discovered_summary.text.erb:3
 msgid "Discovered hosts from Foreman server at %{foreman_url}"
 msgstr "Foreman サーバーの検出されたホスト: %{foreman_url}"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
 msgstr "ディスク数"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
 msgstr "ディスク容量"
 
@@ -932,38 +873,28 @@ msgid "Rule priority (lower integer means higher priority)"
 msgstr "ルールの優先順位 (整数の低い値は高い優先順位を意味します)"
 
 #: ../app/views/discovery_rules/_template_inline.erb:2
-msgid ""
-"Specify target hostname template pattern in the same syntax as in "
-"Provisioning Templates (ERB)."
+msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
 msgstr "プロビジョニングテンプレート (ERB) と同じ構文のターゲットホスト名テンプレートのパターンを指定します。"
 
 #: ../app/views/discovery_rules/_template_inline.erb:4
-msgid ""
-"Domain will be appended automatically. A hostname based on MAC address will "
-"be used when left blank."
+msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr "ドメインは自動的に追加されます。空白のままの場合には、MAC アドレスに基づくホスト名が使用されます。"
 
 #: ../app/views/discovery_rules/_template_inline.erb:5
-msgid ""
-"In addition to @host attribute function rand for random integers is "
-"available. Examples:"
+msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr "@host 属性のほかに、ランダムな整数の rand 関数を利用できます。例:"
 
 #: ../app/views/discovery_rules/_template_inline.erb:8
-msgid ""
-"When creating hostname patterns, make sure the resulting host names are "
-"unique."
+msgid "When creating hostname patterns, make sure the resulting host names are unique."
 msgstr "ホスト名パターンの作成時に、生成されるホスト名が固有であることを確認します。"
 
 #: ../app/views/discovery_rules/_template_inline.erb:9
-msgid ""
-"Hostnames must not start with numbers. A good approach is to use unique "
-"information provided by facter (MAC address, BIOS or serial ID)."
+msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr "ホスト名は数字で開始することができません。facter で提供される固有の情報 (MAC アドレス、BIOS またはシリアル ID) を使用することが適切な方法です。"
 
 #: ../app/views/discovery_rules/edit.html.erb:1
-msgid "Edit Discovery Rule"
-msgstr "検出ルールの編集"
+msgid "Edit %s"
+msgstr ""
 
 #: ../app/views/discovery_rules/index.html.erb:1
 msgid "Discovery Rules"
@@ -1017,30 +948,26 @@ msgstr "1 つ以上のホストが検出されました"
 msgid "Details"
 msgstr "詳細"
 
-#: ../lib/foreman_discovery/engine.rb:151
+#: ../lib/foreman_discovery/engine.rb:158
 msgid "Discovered hosts"
 msgstr "検出されたホスト"
 
-#: ../lib/foreman_discovery/engine.rb:156
+#: ../lib/foreman_discovery/engine.rb:163
 msgid "Discovery rules"
 msgstr "検出ルール"
 
-#: ../lib/foreman_discovery/engine.rb:172
+#: ../lib/foreman_discovery/engine.rb:179
 msgid "Discovery Kexec template"
 msgstr "検出 Kexec テンプレート"
 
-#: ../lib/foreman_discovery/engine.rb:181
+#: ../lib/foreman_discovery/engine.rb:188
 msgid "Discovery Proxy"
 msgstr "検出プロキシー"
 
-#: ../lib/foreman_discovery/engine.rb:182
-msgid ""
-"Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:189
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "検出されたホストへの接続を管理するためにこのサブネット内で使用する検出プロキシー"
 
-#: ../lib/foreman_discovery/engine.rb:183
-msgid ""
-"ID of Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:190
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "検出されたホストへの接続を管理するためにこのサブネット内で使用する検出プロキシーの ID"