foreman_discovery 11.0.0 → 12.0.0

data/locale/sv_SE/foreman_discovery.po

@@ -47,9 +47,6 @@ msgstr ""
 msgid "Auto Provision"
 msgstr ""
 
-msgid "Auto Provision All"
-msgstr ""
-
 msgid "Auto provisioning"
 msgstr ""
 
@@ -77,6 +74,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 ""
 
@@ -98,6 +98,9 @@ msgstr ""
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr "Radera %s?"
 
@@ -107,9 +110,6 @@ msgstr ""
 msgid "Delete a rule"
 msgstr ""
 
-msgid "Delete hosts"
-msgstr "Radera värdar"
-
 msgid "Delete rule '%s'?"
 msgstr ""
 
@@ -128,6 +128,9 @@ msgstr ""
 msgid "Discovered Hosts"
 msgstr "Hittade värdar"
 
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Hittade värdar: %s"
 
@@ -158,6 +161,9 @@ msgstr ""
 msgid "Discovery Rules"
 msgstr ""
 
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
 msgid "Discovery location"
 msgstr ""
 
@@ -191,10 +197,13 @@ msgstr ""
 msgid "Disks size"
 msgstr ""
 
+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"
+msgid "Edit %s"
 msgstr ""
 
 msgid "Enable"
@@ -203,6 +212,9 @@ msgstr ""
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error on existing NIC"
+msgstr ""
+
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
@@ -215,9 +227,6 @@ msgstr ""
 msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
-msgid "Expand All"
-msgstr ""
-
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
@@ -510,9 +519,6 @@ msgstr ""
 msgid "Reboot"
 msgstr ""
 
-msgid "Reboot All"
-msgstr ""
-
 msgid "Rebooting %s"
 msgstr "Startar om %s"
 
@@ -645,13 +651,10 @@ msgstr ""
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-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}"
@@ -696,6 +699,9 @@ msgstr "poster markerade. Avmarkera för att rensa"
 msgid "location ID for provisioned hosts"
 msgstr ""
 
+msgid "must be present."
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr ""
 

data/locale/zh_CN/foreman_discovery.edit.po

@@ -1,16 +1,16 @@
 # 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 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: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
+"age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,23 +21,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 "每个请求中的条目数"
 
@@ -45,8 +41,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）"
 
@@ -67,14 +62,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
@@ -86,62 +78,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 "hash 包含具备最小详情集合的主机的详情：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 "现在正在重启发现主机"
 
@@ -166,8 +150,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
@@ -175,8 +158,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 "按顺序排列规则，低数值优先。必须大于 0"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -223,95 +205,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"
 
@@ -327,19 +309,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 "重启"
 
@@ -347,62 +325,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 "N/A"
 
-#: ../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 " 超过 7 天没有报告"
 
-#: ../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 "发现主机"
 
@@ -438,64 +405,61 @@ 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"
-msgstr[0] "主机组机构 %s 也必须与发现规则关联\n主机组机构 %s 也必须与发现规则关联"
+#: ../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 也必须与发现规则关联\n"
+"主机组机构 %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"
-msgstr[0] "主机组位置 %s 也必须与发现规则关联\n主机组位置 %s 也必须与发现规则关联"
+msgid_plural "Host group locations %s must also be associated to the discovery rule"
+msgstr[0] ""
+"主机组位置 %s 也必须与发现规则关联\n"
+"主机组位置 %s 也必须与发现规则关联"
 
-#: ../app/models/host/discovered.rb:37
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr "无效详情，必须是 Hash"
 
-#: ../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 "无效详情：hash 不包含 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} 在 %{name} 上执行 kexec：%{msg}"
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:247
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "无效的主机名：无法标准化主机名"
 
@@ -548,9 +512,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
@@ -626,9 +588,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
@@ -667,27 +627,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}"
@@ -705,25 +679,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 "内存"
 
@@ -743,16 +707,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 地址"
 
@@ -764,13 +723,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 "机构"
 
@@ -798,18 +755,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
@@ -824,34 +771,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
@@ -866,23 +815,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_url} Foreman 服务器的发现主机"
 
-#: ../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 "磁盘大小"
 
@@ -931,38 +876,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"
@@ -1016,30 +951,26 @@ msgstr "已发现一个或多个主机"
 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"