foreman_discovery 7.0.1 → 8.0.0

data/locale/it/foreman_discovery.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-08-22 14:21+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2016-08-31 08:17+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Italian (http://www.transifex.com/foreman/foreman/language/it/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -133,6 +133,12 @@ msgstr ""
 msgid "Discovered hosts summary"
 msgstr ""
 
+msgid "Discovery Proxy"
+msgstr ""
+
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
 msgid "Discovery Rules"
 msgstr "Regola per la scoperta"
 
@@ -145,9 +151,6 @@ msgstr ""
 msgid "Discovery rules"
 msgstr "Regola per la scoperta"
 
-msgid "Discovery widget"
-msgstr "Widget per la scoperta"
-
 msgid "DiscoveryRule|Enabled"
 msgstr "Abilitata"
 
@@ -229,6 +232,12 @@ msgstr "Impossibile aggiornare gli eventi per %s"
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
+msgid "Force DNS"
+msgstr ""
+
+msgid "Force DNS entries creation when provisioning discovered host"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr ""
 
@@ -284,6 +293,9 @@ msgstr "Limite host"
 msgid "Hosts/limit"
 msgstr "Host/limite"
 
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
@@ -350,7 +362,13 @@ msgstr "Posizioni"
 msgid "Lock PXE"
 msgstr ""
 
-msgid "Locked template name"
+msgid "Locked PXEGrub template name"
+msgstr ""
+
+msgid "Locked PXEGrub2 template name"
+msgstr ""
+
+msgid "Locked PXELinux template name"
 msgstr ""
 
 msgid "MAC address"
@@ -359,9 +377,6 @@ msgstr "Indirizzo MAC"
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
 msgstr "Numero di host massimo con provisioning con questa regola (0 = unlimited)"
 
-msgid "Medium not set for host/hostgroup"
-msgstr ""
-
 msgid "Memory"
 msgstr "Memoria"
 
@@ -425,16 +440,19 @@ msgstr "Nessuna regola trovata per l'host %s"
 msgid "Not reported in more than 7 days"
 msgstr ""
 
-msgid "Operating system not set for host/hostgroup"
-msgstr ""
-
 msgid "Organization"
 msgstr "Organizzazione"
 
 msgid "Organizations"
 msgstr "Organizzazioni"
 
-msgid "PXE template to be used when pinning a host to discovery"
+msgid "PXEGrub template to be used when pinning a host to discovery"
+msgstr ""
+
+msgid "PXEGrub2 template to be used when pinning a host to discovery"
+msgstr ""
+
+msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
 msgid "Please Confirm"
@@ -470,6 +488,9 @@ msgstr ""
 msgid "Rebooting host %s"
 msgstr "Riavvio host %s"
 
+msgid "Rebuild DNS for %s"
+msgstr ""
+
 msgid "Refresh facts"
 msgstr "Aggiorna eventi"
 
@@ -584,6 +605,9 @@ msgstr "I seguenti host non sono stati rilevati: %s"
 msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "Questa operazione potrebbe richiedere qualche istante poichè saranno annullati anche gli host, eventi e riporti"
 
+msgid "Type"
+msgstr ""
+
 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"
 

data/locale/ja/foreman_discovery.edit.po

@@ -1,17 +1,18 @@
 # 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 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 16:48+0200\n"
+"POT-Creation-Date: 2017-01-06 08:26+0100\n"
 "PO-Revision-Date: 2016-08-31 08:17+0000\n"
 "Last-Translator: Lukáš Zapletal\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 +23,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 "要求ごとのエントリー数"
 
@@ -63,14 +60,11 @@ msgid "not required if it's a virtual machine"
 msgstr "仮想マシンの場合は不要です"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
-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:76
-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:86
@@ -82,18 +76,14 @@ msgid "Upload facts for a host, creating the host if required"
 msgstr "ホストのファクトをアップロードし、必要な場合はホストを作成します"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:94
-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:111
 msgid "Execute rules against a discovered host"
 msgstr "検出されたホストに対してルールを実行"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
-#: ../app/controllers/discovered_hosts_controller.rb:165
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117 ../app/controllers/discovered_hosts_controller.rb:162
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "ルール %{rule} でホスト %{host} がプロビジョニングされました"
 
@@ -101,8 +91,7 @@ msgstr "ルール %{rule} でホスト %{host} がプロビジョニングされ
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "%{host} をプロビジョニングできません: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
-#: ../app/controllers/discovered_hosts_controller.rb:172
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126 ../app/controllers/discovered_hosts_controller.rb:169
 msgid "No rule found for host %s"
 msgstr "ホスト %s のルールが見つかりませんでした"
 
@@ -110,13 +99,11 @@ msgstr "ホスト %s のルールが見つかりませんでした"
 msgid "Execute rules against all currently discovered hosts"
 msgstr "現在検出されているすべてのホストに対してルールを実行"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:137
-#: ../app/controllers/discovered_hosts_controller.rb:178
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:137 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "Errors during auto provisioning: %s"
 msgstr "自動プロビジョニング時のエラー: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
-#: ../app/controllers/discovered_hosts_controller.rb:181
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140 ../app/controllers/discovered_hosts_controller.rb:178
 msgid "No discovered hosts to provision"
 msgstr "プロビジョニングする検出されたホストがありません"
 
@@ -136,8 +123,7 @@ msgstr "検出されたホストを再起動中"
 msgid "Rebooting all discovered hosts"
 msgstr "検出されたすべてのホストを再起動中"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:202
-#: ../app/controllers/discovered_hosts_controller.rb:123
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:202 ../app/controllers/discovered_hosts_controller.rb:120
 msgid "Discovered hosts are rebooting now"
 msgstr "現在、検出されたホストを再起動中です"
 
@@ -162,8 +148,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
@@ -171,8 +156,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
@@ -211,95 +195,95 @@ msgstr "再起動中のエラー: %s"
 msgid "No discovered hosts to reboot"
 msgstr "再起動する検出済みホストがありません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:59
+#: ../app/controllers/discovered_hosts_controller.rb:57
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:91
+#: ../app/controllers/discovered_hosts_controller.rb:88
 msgid "Facts refreshed for %s"
 msgstr "%s について更新されたファクト"
 
-#: ../app/controllers/discovered_hosts_controller.rb:93
+#: ../app/controllers/discovered_hosts_controller.rb:90
 msgid "Failed to refresh facts for %s"
 msgstr "%s のファクトの更新に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:96
+#: ../app/controllers/discovered_hosts_controller.rb:93
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr "エラー %{error_message} のため、%{hostname} のファクトの更新に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:103
+#: ../app/controllers/discovered_hosts_controller.rb:100
 msgid "Host of type %s can not be rebooted"
 msgstr "タイプ %s のホストは再起動できません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:107
+#: ../app/controllers/discovered_hosts_controller.rb:104
 msgid "Rebooting host %s"
 msgstr "ホスト %s を再起動中"
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:106
 msgid "Failed to reboot host %s"
 msgstr "ホスト %s の再起動に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr "エラー %{error_message} を出してホスト %{hostname} の再起動に失敗しました。"
 
-#: ../app/controllers/discovered_hosts_controller.rb:126
+#: ../app/controllers/discovered_hosts_controller.rb:123
 msgid "Failed to reboot hosts with error %s"
 msgstr " エラー %s のため、ホストの再起動に失敗しました"
 
-#: ../app/controllers/discovered_hosts_controller.rb:140
+#: ../app/controllers/discovered_hosts_controller.rb:137
 msgid "Destroyed selected hosts"
 msgstr "破棄された選択ホスト"
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:139
 msgid "The following hosts were not deleted: %s"
 msgstr "以下のホストが削除されました: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:169
+#: ../app/controllers/discovered_hosts_controller.rb:166
 msgid "Failed to auto provision host %s: %s"
 msgstr "ホスト %s の自動プロビジョニングに失敗しました: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:197
+#: ../app/controllers/discovered_hosts_controller.rb:194
 msgid "Discovered hosts are provisioning now"
 msgstr "現在、検出されたホストのプロビジョニングが実行されています"
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:303
+#: ../app/controllers/discovered_hosts_controller.rb:300
 msgid "No hosts were found with that id or name"
 msgstr "該当する ID または名前のホストが見つかりませんでした"
 
-#: ../app/controllers/discovered_hosts_controller.rb:307
+#: ../app/controllers/discovered_hosts_controller.rb:304
 msgid "No hosts selected"
 msgstr "ホストが選択されていません"
 
-#: ../app/controllers/discovered_hosts_controller.rb:313
+#: ../app/controllers/discovered_hosts_controller.rb:310
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "ホストの選択中に問題が発生しました - %s"
 
@@ -315,19 +299,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/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/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr "再起動"
 
@@ -335,8 +315,7 @@ msgstr "再起動"
 msgid "Back"
 msgstr "戻る"
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:38
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:38
 msgid "Select Action"
 msgstr "アクションの選択"
 
@@ -344,8 +323,7 @@ msgstr "アクションの選択"
 msgid "Expand All"
 msgstr "すべて展開"
 
-#: ../app/helpers/discovered_hosts_helper.rb:28
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/helpers/discovered_hosts_helper.rb:28 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
 msgid "Delete %s?"
 msgstr "%s を削除しますか?"
 
@@ -385,7 +363,7 @@ msgstr "過去 7 日間以内に報告済み"
 msgid "Provision"
 msgstr "プロビジョニング"
 
-#: ../app/helpers/discovery_rules_helper.rb:26
+#: ../app/helpers/discovery_rules_helper.rb:26 ../lib/foreman_discovery/engine.rb:163
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -430,55 +408,50 @@ 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"
+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] ""
+msgstr[1] ""
 
 #: ../app/models/discovery_rule.rb:51
 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] ""
+msgstr[1] ""
 
-#: ../app/models/host/discovered.rb:33
+#: ../app/models/host/discovered.rb:38
 msgid "Invalid facts, must be a Hash"
 msgstr "無効なファクトです。ハッシュにする必要があります"
 
-#: ../app/models/host/discovered.rb:38
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:43
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "期待される discovery_fact '%s' が不明です。プライマリーインターフェースを検出し、ホスト名を設定できません"
 
-#: ../app/models/host/discovered.rb:45
-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:50
+msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:62
+#: ../app/models/host/discovered.rb:67
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:112
+#: ../app/models/host/discovered.rb:117
 msgid "Unable to assign subnet, primary interface is missing IP address"
 msgstr "サブネットを割り当てることができません。プライマリーインターフェースに IP アドレスがありません"
 
-#: ../app/models/host/discovered.rb:166
+#: ../app/models/host/discovered.rb:174
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "プロキシー %{url} からファクトを取得できませんでした: %{error}"
 
-#: ../app/models/host/discovered.rb:182
+#: ../app/models/host/discovered.rb:190
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "%{url} から %{name} を再起動できません: %{msg}"
 
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:198
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "%{url} から %{name} で kexec を実行できません: %{msg}"
 
-#: ../app/models/host/discovered.rb:209
+#: ../app/models/host/discovered.rb:217
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -523,9 +496,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
@@ -601,9 +572,7 @@ msgid "IPMI facts"
 msgstr ""
 
 #: ../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 ""
 
 #: ../app/models/setting/discovered.rb:32
@@ -611,41 +580,55 @@ msgid "Lock PXE"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:33
-msgid "PXE template to be used when pinning a host to discovery"
+msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:33
-msgid "Locked template name"
+msgid "Locked PXELinux template name"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:34
-msgid "Force DNS entries creation when provisioning discovered host"
+msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:34
+msgid "Locked PXEGrub template name"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:35
+msgid "PXEGrub2 template to be used when pinning a host to discovery"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:35
+msgid "Locked PXEGrub2 template name"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:36
+msgid "Force DNS entries creation when provisioning discovered host"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:36
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:43
 msgid "The default location to place discovered hosts in"
 msgstr "検出されたホストを配置するデフォルトのロケーション"
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:43
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:49
+#: ../app/models/setting/discovered.rb:51
 msgid "The default organization to place discovered hosts in"
 msgstr "検出されたホストを配置するデフォルトの組織"
 
-#: ../app/models/setting/discovered.rb:49
+#: ../app/models/setting/discovered.rb:51
 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}'"
+msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
 msgstr "discovery_fact '%{fact}' で指定された MAC '%{mac}' を使用してプライマリーインターフェースを検出できません"
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
@@ -664,25 +647,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 "メモリー"
 
@@ -698,8 +671,7 @@ msgstr ""
 msgid "Create host"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
-#: ../lib/foreman_discovery/engine.rb:147
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2 ../lib/foreman_discovery/engine.rb:148
 msgid "Discovered hosts"
 msgstr "検出されたホスト"
 
@@ -711,38 +683,27 @@ 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 アドレス"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11 ../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_hosts/_discovered_hosts_list.html.erb:12
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12 ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 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 "組織"
 
@@ -779,9 +740,7 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../app/views/discovered_hosts/multiple_destroy.html.erb:5
-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
@@ -824,13 +783,11 @@ msgstr ""
 msgid "<b>Foreman</b> Discovered hosts summary"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -883,33 +840,23 @@ 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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../app/views/discovery_rules/edit.html.erb:1
@@ -956,10 +903,22 @@ msgstr "新規検出ルール"
 msgid "A summary of discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:152
+#: ../lib/foreman_discovery/engine.rb:153
 msgid "Discovery rules"
 msgstr "検出ルール"
 
+#: ../lib/foreman_discovery/engine.rb:176
+msgid "Discovery Proxy"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:177
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:178
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
 #: ../lib/foreman_discovery/engine.rb:162
-msgid "Discovery widget"
-msgstr "検出ウィジェット"
+#~ msgid "Discovery widget"
+#~ msgstr "検出ウィジェット"