foreman_discovery 16.3.1 → 17.0.1

data/locale/sv_SE/foreman_discovery.po

@@ -8,9 +8,9 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.2.0\n"
+"Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-05-26 17:21+0000\n"
+"PO-Revision-Date: 2021-01-25 08:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
 "uage/sv_SE/)\n"
@@ -23,9 +23,6 @@ msgstr ""
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - Följande värdar kommer att ändras"
 
-msgid "%s ago"
-msgstr "%s sedan"
-
 msgid "%s discovered hosts were provisioned"
 msgstr ""
 
@@ -83,6 +80,12 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Clone"
+msgstr ""
+
+msgid "Clone %s"
+msgstr ""
+
 msgid "Collapse All"
 msgstr ""
 
@@ -148,9 +151,15 @@ msgstr[1] ""
 msgid "Discovered Hosts"
 msgstr "Hittade värdar"
 
+msgid "Discovered Rules"
+msgstr ""
+
 msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
 msgstr ""
 
+msgid "Discovered host reported from unknown subnet, communication will not be proxied."
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Hittade värdar: %s"
 
@@ -163,6 +172,9 @@ msgstr ""
 msgid "Discovered hosts from Foreman server at %{foreman_url}"
 msgstr ""
 
+msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
+msgstr ""
+
 msgid "Discovered hosts summary"
 msgstr ""
 
@@ -229,6 +241,9 @@ msgstr ""
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error message goes here"
+msgstr ""
+
 msgid "Error on existing NIC"
 msgstr ""
 
@@ -283,6 +298,9 @@ msgstr "Misslyckades med att uppdatera fakta för %s"
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
+msgid "For more information please see "
+msgstr ""
+
 msgid "Force DNS"
 msgstr ""
 
@@ -307,6 +325,9 @@ msgstr ""
 msgid "Host"
 msgstr "Värd"
 
+msgid "Host %s has been dicovered"
+msgstr ""
+
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
@@ -474,7 +495,7 @@ msgid "Name"
 msgstr "Namn"
 
 msgid "Name of the parameter"
-msgstr ""
+msgstr "Parameterns namn"
 
 msgid "Network"
 msgstr ""
@@ -485,6 +506,9 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr ""
 
+msgid "New hosts"
+msgstr ""
+
 msgid "New in the last 24 hours"
 msgstr ""
 
@@ -537,7 +561,7 @@ msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
 msgid "Parameter value"
-msgstr ""
+msgstr "Parametervärde"
 
 msgid "Please Confirm"
 msgstr "Var god, bekräfta"
@@ -731,6 +755,9 @@ msgstr ""
 msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr ""
 
+msgid "documentation"
+msgstr ""
+
 msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr ""
 

data/locale/zh_CN/foreman_discovery.edit.po

@@ -5,10 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.2.0\n"
+"Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-05-26 17:21+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2021-05-03 08:46+0200\n"
+"PO-Revision-Date: 2021-01-25 08:35+0000\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,15 +28,15 @@ msgstr "过滤结果"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
 msgid "sort results"
-msgstr "结果排序"
+msgstr "排序結果"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
-msgstr "编页结果"
+msgstr "編頁結果"
 
 #: ../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 "每个请求中的条目数"
+msgstr "每個請求的項目數量"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:26
 msgid "Show a discovered host"
@@ -55,11 +56,11 @@ msgstr "置备发现主机"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:54 ../app/controllers/api/v2/discovered_hosts_controller.rb:57 ../app/controllers/api/v2/discovered_hosts_controller.rb:58 ../app/controllers/api/v2/discovered_hosts_controller.rb:61 ../app/controllers/api/v2/discovered_hosts_controller.rb:64
 msgid "required if host is managed and value is not inherited from host group"
-msgstr ""
+msgstr "若主機是個受管理的主機，並且值不是由主機群組所繼承的話便需要"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
 msgid "not required if using a subnet with DHCP proxy"
-msgstr "如果使用附带 DHCP 代理服务器的子网则不需要"
+msgstr "若是使用一個含有 DHCP 協定的子網路則不需要"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:56
 msgid "not required if it's a virtual machine"
@@ -67,35 +68,35 @@ msgstr "如果是虚拟机，则不需要"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
 msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
-msgstr ""
+msgstr "若不是基於映像檔的佈建，而主機受管理並且值並非由主機群組所繼承的話便需要"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
 msgid "required if host is managed and custom partition has not been defined"
-msgstr ""
+msgstr "如果已管理主机，且未定义自定义分区，则需填写。"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
 msgid "Host's owner type"
-msgstr ""
+msgstr "主机拥有者类型"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
 msgid "Host's parameters (array or indexed hash)"
-msgstr ""
+msgstr "主机参数（阵列或索引哈希）"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
 msgid "Name of the parameter"
-msgstr ""
+msgstr "參數名稱"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
 msgid "Parameter value"
-msgstr ""
+msgstr "参数值"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
 msgid "Type of value"
-msgstr ""
+msgstr "值类型"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
-msgstr "用来跟踪业务流程任务状态的 UUID，GET /api/orchestration/:UUID/tasks"
+msgstr "用來追蹤協調流程任務狀態的 UUID，GET /api/orchestration/:UUID/tasks"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
 msgid "required if value is not inherited from host group or default password in settings"
@@ -107,57 +108,57 @@ msgstr "删除发现主机"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
 msgid "Upload facts for a host, creating the host if required"
-msgstr "上传主机的系统详情，如需要，请创建主机。"
+msgstr "上傳主機的詳情，並視需求建立主機"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
 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:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:130
 msgid "Execute rules against a discovered host"
 msgstr "对发现主机执行规则"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:135 ../app/controllers/discovered_hosts_controller.rb:160
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:157
 msgid "Host %{host} was provisioned with rule %{rule}"
-msgstr "主机 %{host} 置备了规则 %{rule}"
+msgstr "主机 %{host} 被置备，带有规则 %{rule}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:139
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "无法置备 %{host}：%{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:144 ../app/controllers/discovered_hosts_controller.rb:167
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:164
 msgid "No rule found for host %s"
 msgstr "没有为主机 %s 找到规则"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:151
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:152
 msgid "Execute rules against all currently discovered hosts"
 msgstr "对当前所有发现主机执行规则"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:155 ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:170
 msgid "Errors during auto provisioning: %s"
 msgstr "自动置备期间出错：%s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:158 ../app/controllers/discovered_hosts_controller.rb:176
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:173
 msgid "No discovered hosts to provision"
 msgstr "没有要置备的发现主机"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:181
 msgid "%s discovered hosts were provisioned"
-msgstr "已置备 %s 发现主机"
+msgstr "%s 发现的主机被置备"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:192
 msgid "Refreshing the facts of a discovered host"
 msgstr "刷新发现主机的详情"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:201
 msgid "Rebooting a discovered host"
 msgstr "重启发现主机"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:209
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:210
 msgid "Rebooting all discovered hosts"
 msgstr "重启所有发现主机"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:220 ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:126
 msgid "Discovered hosts are rebooting now"
 msgstr "现在正在重启发现主机"
 
@@ -227,147 +228,123 @@ msgstr "无法找到发现规则，未提供主机（检查许可）"
 
 #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:43
 msgid "No hostgroup associated with rule '%s'"
-msgstr "没有主机组与规则 '%s' 关联"
+msgstr "没有与规则 '%s' 关联的主机组"
 
 #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
 msgid "Errors during reboot: %s"
-msgstr "重启期间出错：%s"
+msgstr "重启时出错：%s"
 
 #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
 msgid "No discovered hosts to reboot"
 msgstr "没有要重启的发现主机"
 
-#: ../app/controllers/discovered_hosts_controller.rb:63
+#: ../app/controllers/discovered_hosts_controller.rb:60
 msgid "Successfully provisioned %s"
 msgstr "已成功置备 %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:97
+#: ../app/controllers/discovered_hosts_controller.rb:94
 msgid "Facts refreshed for %s"
-msgstr "为 %s 刷新详情"
+msgstr "%s 的事实已刷新"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Failed to refresh facts for %s"
-msgstr "为 %s 刷新详情失败"
+msgstr "%s 的事实刷新失败"
 
-#: ../app/controllers/discovered_hosts_controller.rb:102
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
-msgstr "为 %{hostname} 刷新详情失败，发生错误 %{error_message} "
+msgstr "为 %{hostname} 刷新事实失败，错误为 %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:106
 msgid "Host of type %s can not be rebooted"
 msgstr "%s 类型的主机不能重启"
 
-#: ../app/controllers/discovered_hosts_controller.rb:113
+#: ../app/controllers/discovered_hosts_controller.rb:110
 msgid "Rebooting host %s"
 msgstr "正在重启主机 %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Failed to reboot host %s"
-msgstr "无法重启主机 %s"
+msgstr "重启主机 %s 失败"
 
-#: ../app/controllers/discovered_hosts_controller.rb:118
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
-msgstr "无法重启主机 %{hostname}，发生错误 %{error_message}"
+msgstr "重启主机 %{hostname} 失败，错误为 %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:132
+#: ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Failed to reboot hosts with error %s"
-msgstr "无法重启主机，发生错误 %s"
+msgstr "无法重启主机，错误 %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/discovered_hosts_controller.rb:147
 msgid "Destroyed selected hosts"
-msgstr "消除所选主机"
+msgstr "刪除選擇的主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/discovered_hosts_controller.rb:149
 msgid "The following hosts were not deleted: %s"
-msgstr "未删除以下主机：%s"
+msgstr "以下主机没有删除：%s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/discovered_hosts_controller.rb:161
 msgid "Failed to auto provision host %s: %s"
 msgstr "无法自动置备主机 %s：%s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:192
+#: ../app/controllers/discovered_hosts_controller.rb:189
 msgid "Discovered hosts are provisioning now"
 msgstr "现在发现主机正在置备"
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Highlights"
-msgstr "亮点"
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Storage"
-msgstr "存储"
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Hardware"
-msgstr "硬件"
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Network"
-msgstr "网络"
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Software"
-msgstr "软件"
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "IPMI"
-msgstr "IPMI"
+#: ../app/controllers/discovered_hosts_controller.rb:270
+msgid "Discovered host reported from unknown subnet, communication will not be proxied."
+msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Miscellaneous"
-msgstr "杂项"
+#: ../app/controllers/discovered_hosts_controller.rb:275
+msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
+msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:304
+#: ../app/controllers/discovered_hosts_controller.rb:289
 msgid "No hosts were found with that id or name"
-msgstr "未找到符合此 id 或者名称的主机"
+msgstr "沒有找到擁有此 ID 或名稱的主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:308
+#: ../app/controllers/discovered_hosts_controller.rb:293
 msgid "No hosts selected"
-msgstr "未选择任何主机"
+msgstr "未選擇主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:314
+#: ../app/controllers/discovered_hosts_controller.rb:299
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "选择主机时出错 - %s"
 
-#: ../app/controllers/discovery_rules_controller.rb:68
+#: ../app/controllers/discovery_rules_controller.rb:79
 msgid "Rule enabled"
 msgstr "已启用规则"
 
-#: ../app/controllers/discovery_rules_controller.rb:68
+#: ../app/controllers/discovery_rules_controller.rb:79
 msgid "Rule disabled"
 msgstr "已禁用规则"
 
-#: ../app/helpers/discovered_hosts_helper.rb:10
-msgid "%s ago"
-msgstr "%s 前"
-
-#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
 msgid "Auto Provision"
 msgstr "自动置备"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
 msgid "Refresh facts"
-msgstr "刷新详情"
+msgstr "刷新詳情"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42
 msgid "Reboot"
 msgstr "重启"
 
 #: ../app/helpers/discovered_hosts_helper.rb:19
 msgid "Back"
-msgstr "后退"
+msgstr "返回"
 
 #: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
 msgid "Select Action"
-msgstr "选择动作"
+msgstr "選擇動作"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
 msgid "Delete %s?"
-msgstr "删除 %s"
+msgstr "刪除 %s?"
 
 #: ../app/helpers/discovered_hosts_helper.rb:31
 msgid "Assign Organization"
-msgstr "指定机构"
+msgstr "指定組織"
 
 #: ../app/helpers/discovered_hosts_helper.rb:32
 msgid "Assign Location"
@@ -375,15 +352,15 @@ msgstr "指定位置"
 
 #: ../app/helpers/discovered_hosts_helper.rb:33
 msgid "Delete"
-msgstr "删除"
+msgstr "刪除"
 
 #: ../app/helpers/discovered_hosts_helper.rb:37
 msgid "%s - The following hosts are about to be changed"
-msgstr "%s - 要更改以下主机"
+msgstr "%s - 以下主机即将更改"
 
 #: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
-msgstr "N/A"
+msgstr "N / A"
 
 #: ../app/helpers/discovered_hosts_helper.rb:58
 msgid "New in the last 24 hours"
@@ -391,7 +368,7 @@ msgstr "在最近 24 小时之内新建"
 
 #: ../app/helpers/discovered_hosts_helper.rb:62
 msgid "Not reported in more than 7 days"
-msgstr " 超过 7 天没有报告"
+msgstr "没有超过 7 天的报告"
 
 #: ../app/helpers/discovered_hosts_helper.rb:66
 msgid "Reported in the last 7 days"
@@ -399,7 +376,7 @@ msgstr "最近 7 天内报告"
 
 #: ../app/helpers/discovered_hosts_helper.rb:90
 msgid "Provision"
-msgstr "供应"
+msgstr "置备"
 
 #: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:159 ../lib/foreman_discovery/engine.rb:174
 msgid "Discovered Hosts"
@@ -426,6 +403,10 @@ msgid "Enable rule '%s'?"
 msgstr "启用规则 '%s'？"
 
 #: ../app/helpers/discovery_rules_helper.rb:33
+msgid "Clone"
+msgstr ""
+
+#: ../app/helpers/discovery_rules_helper.rb:34
 msgid "Delete rule '%s'?"
 msgstr "删除规则 '%s'？"
 
@@ -449,17 +430,15 @@ msgstr "必须以字母或 ERB 开始。"
 msgid "must be present."
 msgstr "必须存在。"
 
-#: ../app/models/discovery_rule.rb:52
+#: ../app/models/discovery_rule.rb:57
 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] ""
+msgstr[0] "主机组机构 %s 也必须与发现规则关联"
 
-#: ../app/models/discovery_rule.rb:56
+#: ../app/models/discovery_rule.rb:61
 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] ""
-msgstr[1] ""
+msgstr[0] "主机组位置 %s 也必须与发现规则关联"
 
 #: ../app/models/host/discovered.rb:40
 msgid "Fact + prefix"
@@ -479,7 +458,7 @@ msgstr "无效详情，必须是 Hash"
 
 #: ../app/models/host/discovered.rb:60
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
-msgstr "期望的 discovery_fact '%s' 缺失，无法检测主接口和设置主机名称"
+msgstr "缺少期望的 discovery_fact '%s'，无法检测主接口和设置主机名称"
 
 #: ../app/models/host/discovered.rb:73
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
@@ -495,15 +474,15 @@ msgstr "无法从代理 %{url} 获得详情：%{error}"
 
 #: ../app/models/host/discovered.rb:160
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
-msgstr ""
+msgstr "无法在%{name}（%{url}）上执行重新引导：%{msg}"
 
 #: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
 msgid "Unable to perform %{action} on %{ips}"
-msgstr ""
+msgstr "无法在 %{ips} 上执行 %{action}"
 
 #: ../app/models/host/discovered.rb:179
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
-msgstr ""
+msgstr "无法在 %{name} (%{url}) 上执行 kexec : %{msg}"
 
 #: ../app/models/host/discovered.rb:203
 msgid "Invalid hostname: Could not normalize the hostname"
@@ -515,7 +494,7 @@ msgstr "正在 %s 上重新加载内核"
 
 #: ../app/models/host/managed_extensions.rb:25
 msgid "Rebooting %s"
-msgstr "正在重启 %s"
+msgstr "重启 %s"
 
 #: ../app/models/host/managed_extensions.rb:46
 msgid "Kexec template not associated with operating system"
@@ -535,7 +514,7 @@ msgstr "为 %s 重建 DNS"
 
 #: ../app/models/setting/discovered.rb:17
 msgid "The default location to place discovered hosts in"
-msgstr "找到主机的默认位置"
+msgstr "放置已發現之主機的預設位置"
 
 #: ../app/models/setting/discovered.rb:17
 msgid "Discovery location"
@@ -543,7 +522,7 @@ msgstr "发现位置"
 
 #: ../app/models/setting/discovered.rb:18
 msgid "The default organization to place discovered hosts in"
-msgstr "找到主机的默认机构"
+msgstr "放置已發現之主機的預設組織"
 
 #: ../app/models/setting/discovered.rb:18
 msgid "Discovery organization"
@@ -715,7 +694,7 @@ msgstr "名称生成器类型"
 
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
-msgstr "发现 fact 解析器无法在未发现主机 '%{host}' 上工作"
+msgstr "发现事实解析器无法在未发现主机 '%{host}' 上工作"
 
 #: ../app/services/foreman_discovery/fact_parser.rb:6
 msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
@@ -723,25 +702,56 @@ msgstr "发现的主机 '%{host}' 的所有 NIC 都被过滤掉，过滤：%{fil
 
 #: ../app/services/foreman_discovery/fact_parser.rb:12
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
-msgstr "无法找到带有 '%{fact}' 指定的 %{mac} 的主 NIC。NIC 过滤：%{filter}"
+msgstr "无法找到带有通过 '%{fact}' 指定的 '%{mac}' 的主 NIC。NIC 过滤：%{filter}"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:7
+msgid "Highlights"
+msgstr "亮点"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:8
+msgid "Storage"
+msgstr "存储"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:9
+msgid "Hardware"
+msgstr "硬件"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:10
+msgid "Network"
+msgstr "网络"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:11
+msgid "Software"
+msgstr "软件"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:12
+msgid "IPMI"
+msgstr "IPMI"
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:13
+msgid "Miscellaneous"
+msgstr "杂项"
 
 #: ../app/services/foreman_discovery/host_converter.rb:47
 msgid "IPAM must be configured for subnet '%s'"
-msgstr ""
+msgstr "必须为子网 '%s' 配置 IPAM"
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:76
 msgid "Image API returned HTTP/%{code} with '%{body}"
-msgstr "镜像 API 返回 HTTP/%{code} 与 '%{body}"
+msgstr "镜像 API 返回 HTTP/%{code}，带有 '%{body}"
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:79
 msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
-msgstr "镜像 API 处理出错：%{msg}（HTTP/%{code}，主体：%{body}）"
+msgstr "图片 API 处理错误：%{msg} （HTTP /%{code} ， 内容：%{body} ）"
+
+#: ../app/services/foreman_discovery/ui_notifications/new_host.rb:22
+msgid "Host %s has been dicovered"
+msgstr ""
 
 #: ../app/views/dashboard/_discovery_widget.html.erb:5
 msgid "Discovered Host"
 msgid_plural "Discovered Hosts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "发现的主机"
 
 #: ../app/views/dashboard/_discovery_widget.html.erb:9
 msgid "No discovered hosts available"
@@ -749,19 +759,19 @@ msgstr "没有可用的发现主机"
 
 #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:3
 msgid "Host"
-msgstr "主机"
+msgstr "主办"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../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 "型号"
+msgstr "模型"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../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:9 ../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 "内存"
+msgstr "记忆"
 
 #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
 msgid "Customize Host"
@@ -771,59 +781,59 @@ msgstr "自定义主机"
 msgid "Create Host"
 msgstr "创建主机"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "Select all items in this page"
-msgstr "选择本页中的所有项目"
+msgstr "選擇這頁中的所有項目"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "items selected. Uncheck to Clear"
-msgstr "已选择项目。取消选择清除。"
+msgstr "已選取項目。反選以清除"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5 ../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:7 ../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 地址"
+msgstr "IP地址"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
 msgid "Disk Count"
 msgstr "磁盘计数"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
 msgid "Disks Size"
 msgstr "磁盘大小"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9 ../app/views/discovery_rules/index.html.erb:11
 msgid "Location"
 msgstr "位置"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../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 ../app/views/discovery_rules/index.html.erb:12
 msgid "Organization"
 msgstr "机构"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Subnet"
 msgstr "子网"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
 msgid "Last Facts Upload"
 msgstr "最后详情上传"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19 ../app/views/discovery_rules/index.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:14
 msgid "Actions"
 msgstr "操作"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:51
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
 msgid "Please Confirm"
-msgstr "请确认"
+msgstr "請確認"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
 msgid "Cancel"
 msgstr "取消"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:62
 msgid "Submit"
 msgstr "提交"
 
@@ -833,19 +843,19 @@ msgstr "置备 %s"
 
 #: ../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"
-msgstr "这需要一些时间，因为同时还要删除所有主机、详情及报告。"
+msgstr "這可能會花上一段時間，因為所有主機、詳情與報告皆會被刪除"
 
 #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
 msgid "Select location"
-msgstr "选择位置"
+msgstr "選擇位置"
 
 #: ../app/views/discovered_hosts/select_multiple_organization.html.erb:5
 msgid "Select organization"
-msgstr "选择机构"
+msgstr "選擇組織"
 
 #: ../app/views/discovered_hosts/show.html.erb:1
 msgid "Discovered host: %s"
-msgstr "找到的主机：%s"
+msgstr "发现的主机：%s"
 
 #: ../app/views/discovered_hosts/show.html.erb:37
 msgid "Interfaces"
@@ -853,23 +863,23 @@ msgstr "接口"
 
 #: ../app/views/discovered_hosts/show.html.erb:44
 msgid "Type"
-msgstr "类型"
+msgstr "類型"
 
 #: ../app/views/discovered_hosts/show.html.erb:45
 msgid "Identifier"
-msgstr "身份标识"
+msgstr "鉴定"
 
 #: ../app/views/discovered_hosts/show.html.erb:46
 msgid "MAC address"
-msgstr "MAC 地址"
+msgstr "MAC 位址"
 
 #: ../app/views/discovered_hosts/show.html.erb:47
 msgid "IP address"
-msgstr "IP 地址"
+msgstr "IP 位址"
 
 #: ../app/views/discovered_hosts/show.html.erb:66
 msgid "Collapse All"
-msgstr "隐藏全部"
+msgstr "全部折叠"
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
 msgid "Summary report for discovered hosts from Foreman"
@@ -877,11 +887,11 @@ msgstr "来自 Foreman 的 发现主机概述报告"
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:9
 msgid "<b>Foreman</b> Discovered hosts summary"
-msgstr "<b>Foreman</b> 发现主机概述"
+msgstr "<b>Foreman</b> 发现的主机概述"
 
 #: ../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} 的概述"
+msgstr "从%{time}以前到 %{now} 的概述"
 
 #: ../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}"
@@ -889,11 +899,11 @@ msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
-msgstr "磁盘计数"
+msgstr "磁碟計數"
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
-msgstr "磁盘大小"
+msgstr "磁碟大小"
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:31
 msgid "No discovered hosts for the selected period"
@@ -929,7 +939,7 @@ msgstr "置备主机的主机名"
 
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Hosts Limit"
-msgstr "主机限制"
+msgstr "主機限制"
 
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
@@ -959,6 +969,10 @@ msgstr "创建主机名模式时，确保生成的主机名是唯一的。"
 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/clone.erb:1
+msgid "Clone %s"
+msgstr ""
+
 #: ../app/views/discovery_rules/edit.html.erb:1
 msgid "Edit %s"
 msgstr "编辑 %s"
@@ -967,7 +981,7 @@ msgstr "编辑 %s"
 msgid "Discovery Rules"
 msgstr "发现规则"
 
-#: ../app/views/discovery_rules/index.html.erb:2
+#: ../app/views/discovery_rules/index.html.erb:2 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:9
 msgid "Create Rule"
 msgstr "创建规则"
 
@@ -985,13 +999,13 @@ msgstr "发现规则|查询"
 
 #: ../app/views/discovery_rules/index.html.erb:9
 msgid "Host Group"
-msgstr "主机组"
+msgstr "主機群組"
 
 #: ../app/views/discovery_rules/index.html.erb:10
 msgid "Hosts/Limit"
 msgstr "主机/限制"
 
-#: ../app/views/discovery_rules/index.html.erb:11
+#: ../app/views/discovery_rules/index.html.erb:13
 msgid "DiscoveryRule|Enabled"
 msgstr "发现规则|已启用"
 
@@ -999,17 +1013,21 @@ msgstr "发现规则|已启用"
 msgid "New Discovery Rule"
 msgstr "新建发现规则"
 
+#: ../app/views/discovery_rules/welcome.html.erb:8
+msgid "Discovered Rules"
+msgstr ""
+
 #: ../db/seeds.d/50_discovery_templates.rb:5
 msgid "Command line options for kexec during PXE-less provisioning."
-msgstr "在 PXE-less 置备过程中  kexec 的命令行选项。"
+msgstr "在 PXE-less 置备过程中 kexec 的命令行选项。"
 
 #: ../db/seeds.d/70_discovery_mail_notification.rb:3
 msgid "A summary of discovered hosts"
 msgstr "发现主机概述"
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:4
-msgid "Hosts"
-msgstr "主机"
+msgid "New hosts"
+msgstr ""
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:6
 msgid "One or more hosts have been discovered"
@@ -1017,45 +1035,56 @@ msgstr "已发现一个或多个主机"
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:13
 msgid "Details"
-msgstr "详情"
+msgstr "细节"
+
+#: ../db/seeds.d/80_discovery_ui_notification.rb:18
+msgid "Hosts"
+msgstr "主机"
+
+#: ../db/seeds.d/80_discovery_ui_notification.rb:20
+msgid "Error message goes here"
+msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:180
+#: ../lib/foreman_discovery/engine.rb:176
 msgid "Discovery Kexec template"
 msgstr "发现 Kexec 模板"
 
-#: ../lib/foreman_discovery/engine.rb:189
+#: ../lib/foreman_discovery/engine.rb:185
 msgid "Discovery Proxy"
 msgstr "发现代理服务器"
 
-#: ../lib/foreman_discovery/engine.rb:190
+#: ../lib/foreman_discovery/engine.rb:186
 msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
 
-#: ../lib/foreman_discovery/engine.rb:191
+#: ../lib/foreman_discovery/engine.rb:187
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
 
+#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:33
+msgid "For more information please see "
+msgstr "查看详情 "
+
+#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:34
+msgid "documentation"
+msgstr "文档"
+
 #: action_names.rb:2
 msgid "Remote action:"
-msgstr ""
+msgstr "远程操作："
 
 #: action_names.rb:3
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "导入 Puppet 类"
 
 #: action_names.rb:4
-msgid "Action with sub plans"
-msgstr ""
+msgid "Import facts"
+msgstr "匯入詳情"
 
 #: action_names.rb:5
-msgid "Import facts"
-msgstr ""
+msgid "Action with sub plans"
+msgstr "有子計畫的動作"
 
-#~ msgid "Learn more about this in the documentation."
-#~ msgstr "在本文档中了解更多这方面的内容。"
-#~ msgid "No discovered hosts found in this context."
-#~ msgstr "在此上下文中未找到发现主机。"
-#~ msgid ""
-#~ "This page shows discovered bare-metal or virtual nodes waiting to be provision"
-#~ "ed."
-#~ msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
+#: ../app/helpers/discovered_hosts_helper.rb:10
+#~ msgid "%s ago"
+#~ msgstr "%s 前"