foreman_discovery 16.1.4 → 16.3.6

data/locale/zh_CN/foreman_discovery.edit.po

@@ -7,7 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-12-01 08:28+0000\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"
@@ -113,51 +114,51 @@ msgstr "上傳主機的詳情，並視需求建立主機"
 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}"
 
-#: ../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 发现的主机被置备"
 
-#: ../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 "现在正在重启发现主机"
 
@@ -237,110 +238,86 @@ msgstr "重启时出错：%s"
 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 的事实已刷新"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Failed to refresh facts for %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}"
 
-#: ../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 失败"
 
-#: ../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}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:132
+#: ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Failed to reboot hosts with error %s"
 msgstr "无法重启主机，错误 %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/discovered_hosts_controller.rb:147
 msgid "Destroyed selected hosts"
 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"
 
-#: ../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 或名稱的主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:308
+#: ../app/controllers/discovered_hosts_controller.rb:293
 msgid "No hosts selected"
 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:72
+#: ../app/controllers/discovery_rules_controller.rb:79
 msgid "Rule enabled"
 msgstr "已启用规则"
 
-#: ../app/controllers/discovery_rules_controller.rb:72
+#: ../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:40
 msgid "Auto Provision"
 msgstr "自动置备"
@@ -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,12 +430,12 @@ 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] "主机组机构 %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] "主机组位置 %s 也必须与发现规则关联"
@@ -723,6 +704,34 @@ msgstr "发现的主机 '%{host}' 的所有 NIC 都被过滤掉，过滤：%{fil
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{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 "必须为子网 '%s' 配置 IPAM"
@@ -735,6 +744,10 @@ msgstr "镜像 API 返回 HTTP/%{code}，带有 '%{body}"
 msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{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"
@@ -792,11 +805,11 @@ msgstr "磁盘计数"
 msgid "Disks Size"
 msgstr "磁盘大小"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../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: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 ../app/views/discovery_rules/index.html.erb:12
 msgid "Organization"
 msgstr "机构"
 
@@ -808,7 +821,7 @@ msgstr "子网"
 msgid "Last Facts Upload"
 msgstr "最后详情上传"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../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 "操作"
 
@@ -956,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"
@@ -988,7 +1005,7 @@ msgstr "主機群組"
 msgid "Hosts/Limit"
 msgstr "主机/限制"
 
-#: ../app/views/discovery_rules/index.html.erb:11
+#: ../app/views/discovery_rules/index.html.erb:13
 msgid "DiscoveryRule|Enabled"
 msgstr "发现规则|已启用"
 
@@ -1009,8 +1026,8 @@ 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"
@@ -1020,42 +1037,54 @@ msgstr "已发现一个或多个主机"
 msgid "Details"
 msgstr "细节"
 
-#: ../lib/foreman_discovery/engine.rb:180
+#: ../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: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 ""
+msgstr "查看详情 "
 
 #: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:34
 msgid "documentation"
-msgstr ""
+msgstr "文档"
 
 #: action_names.rb:2
-msgid "Action with sub plans"
-msgstr "有子計畫的動作"
+msgid "Remote action:"
+msgstr "远程操作："
 
 #: action_names.rb:3
-msgid "Import facts"
-msgstr "匯入詳情"
-
-#: action_names.rb:4
 msgid "Import Puppet classes"
 msgstr "导入 Puppet 类"
 
+#: action_names.rb:4
+msgid "Import facts"
+msgstr "匯入詳情"
+
 #: action_names.rb:5
-msgid "Remote action:"
-msgstr "远程操作："
+msgid "Action with sub plans"
+msgstr "有子計畫的動作"
+
+#: ../app/helpers/discovered_hosts_helper.rb:10
+#~ msgid "%s ago"
+#~ msgstr "%s 前"

data/locale/zh_CN/foreman_discovery.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.1.3\n"
+"Project-Id-Version: foreman_discovery 16.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-05-26 17:21+0000\n"
 "Last-Translator: Transifex Bot <>\n"
@@ -323,6 +323,12 @@ msgstr[1] ""
 msgid "Host of type %s can not be rebooted"
 msgstr "%s 类型的主机不能重启"
 
+msgid "Host's owner type"
+msgstr ""
+
+msgid "Host's parameters (array or indexed hash)"
+msgstr ""
+
 msgid "Hostname facts"
 msgstr "主机名详情"
 
@@ -410,9 +416,6 @@ msgstr "Kexec 模板未与操作系统关联"
 msgid "Last Facts Upload"
 msgstr "最后详情上传"
 
-msgid "Learn more about this in the documentation."
-msgstr "在本文档中了解更多这方面的内容。"
-
 msgid "List all discovered hosts"
 msgstr "列出所有发现主机"
 
@@ -467,6 +470,9 @@ msgstr "N/A"
 msgid "Name"
 msgstr "名称"
 
+msgid "Name of the parameter"
+msgstr ""
+
 msgid "Network"
 msgstr "网络"
 
@@ -485,9 +491,6 @@ msgstr "没有可用的发现主机"
 msgid "No discovered hosts for the selected period"
 msgstr "选定时间段内没有发现主机"
 
-msgid "No discovered hosts found in this context."
-msgstr "在此上下文中未找到发现主机。"
-
 msgid "No discovered hosts to provision"
 msgstr "没有要置备的发现主机"
 
@@ -530,6 +533,9 @@ msgstr "将主机固定至发现时使用的 PXEGrub2 模板"
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr "将主机固定至发现时使用的 PXELinux 模板"
 
+msgid "Parameter value"
+msgstr ""
+
 msgid "Please Confirm"
 msgstr "请确认"
 
@@ -677,15 +683,15 @@ msgstr "未删除以下主机：%s"
 msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "这需要一些时间，因为同时还要删除所有主机、详情及报告。"
 
-msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
-msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
-
 msgid "Type"
 msgstr "类型"
 
 msgid "Type of name generator"
 msgstr "名称生成器类型"
 
+msgid "Type of value"
+msgstr ""
+
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "用来跟踪业务流程任务状态的 UUID，GET /api/orchestration/:UUID/tasks"
 
@@ -770,6 +776,15 @@ msgstr "与特定规则的发现主机匹配的查询"
 msgid "represents rule name shown to the users"
 msgstr "代表显示给用户的规则名称"
 
+msgid "required if host is managed and custom partition has not been defined"
+msgstr ""
+
+msgid "required if host is managed and value is not inherited from host group"
+msgstr ""
+
+msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
+msgstr ""
+
 msgid "required if value is not inherited from host group or default password in settings"
 msgstr "如果数值不是从主机组或设置中的默认密码继承，则需要。"