foreman_discovery 7.0.1 → 8.0.0

data/locale/zh_CN/foreman_discovery.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-08-22 15:09+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: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -131,6 +131,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 "发现规则"
 
@@ -143,9 +149,6 @@ msgstr ""
 msgid "Discovery rules"
 msgstr "发现规则"
 
-msgid "Discovery widget"
-msgstr "发现小程序"
-
 msgid "DiscoveryRule|Enabled"
 msgstr "已禁用"
 
@@ -227,6 +230,12 @@ msgstr "为 %s 刷新详情失败"
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr "刷新 %{hostname} 系统信息失败，并给出出错信息 %{error_message}。"
 
+msgid "Force DNS"
+msgstr ""
+
+msgid "Force DNS entries creation when provisioning discovered host"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr ""
 
@@ -282,6 +291,9 @@ msgstr "主机限制"
 msgid "Hosts/limit"
 msgstr "主机/限制"
 
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
 msgid "IP Address"
 msgstr "IP地址"
 
@@ -348,7 +360,13 @@ msgstr "位置"
 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"
@@ -357,9 +375,6 @@ msgstr "MAC 地址"
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
 msgstr "根据此规则可供应的最大主机数（0 代表无限）"
 
-msgid "Medium not set for host/hostgroup"
-msgstr "没有为主机/主机组设置媒体"
-
 msgid "Memory"
 msgstr "内存"
 
@@ -423,16 +438,19 @@ msgstr "未找到主机 %s 的规则"
 msgid "Not reported in more than 7 days"
 msgstr "超过 7 天没有报告的"
 
-msgid "Operating system not set for host/hostgroup"
-msgstr "没有为主机/主机组设置操作系统"
-
 msgid "Organization"
 msgstr "机构"
 
 msgid "Organizations"
 msgstr "机构"
 
-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"
@@ -468,6 +486,9 @@ msgstr "重启已发现主机"
 msgid "Rebooting host %s"
 msgstr "正在重启主机 %s"
 
+msgid "Rebuild DNS for %s"
+msgstr ""
+
 msgid "Refresh facts"
 msgstr "刷新详情"
 
@@ -582,6 +603,9 @@ msgstr "未删除以下主机：%s"
 msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "这需要一些时间，因为同时还要删除所有主机、详情及报告。"
 
+msgid "Type"
+msgstr ""
+
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "用来跟踪复杂任务状态的 UUID，GET /api/orchestration/:UUID/tasks"
 

data/locale/zh_TW/foreman_discovery.edit.po

@@ -1,16 +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:
 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: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
+"uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,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 "每個請求的項目數量"
 
@@ -62,14 +59,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
@@ -81,18 +75,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 "主機 %{host} 已透過規則 %{rule} 佈建"
 
@@ -100,8 +90,7 @@ msgstr "主機 %{host} 已透過規則 %{rule} 佈建"
 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 的規則"
 
@@ -109,13 +98,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 "未發現可佈建的主機"
 
@@ -135,8 +122,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 "發現的主機正在重新啟動"
 
@@ -161,8 +147,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
@@ -170,8 +155,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
@@ -210,95 +194,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 "重新刷新主機 %{hostname} 的事實失敗，錯誤訊息為 %{error_message}"
 
-#: ../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 "重新啟動主機 %{hostname} 失敗，錯誤訊息為 %{error_message}"
 
-#: ../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"
 
@@ -314,19 +298,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 "重新開機"
 
@@ -334,8 +314,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 "選擇動作"
 
@@ -343,8 +322,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？"
 
@@ -384,7 +362,7 @@ msgstr "過去七天內已回報"
 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 ""
 
@@ -429,55 +407,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 ""
 
@@ -522,9 +495,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
@@ -600,9 +571,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
@@ -610,41 +579,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 "無法偵測使用 MAC '%{mac}' 的主介面，由 discovery_fact '%{fact}' 所指定"
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
@@ -663,25 +646,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 "記憶體"
 
@@ -697,8 +670,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 "發現的主機"
 
@@ -710,38 +682,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 "組織"
 
@@ -778,9 +739,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
@@ -823,13 +782,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 ""
 
@@ -882,33 +839,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
@@ -955,10 +902,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 "搜尋工具組"