foreman_discovery 13.0.1 → 14.0.0

data/locale/zh_CN/foreman_discovery.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 13.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2018-06-15 10:50+0000\n"
+"PO-Revision-Date: 2018-10-25 20:13+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
@@ -32,6 +32,9 @@ msgstr "<b>Foreman</b> 发现主机概述"
 msgid "A summary of discovered hosts"
 msgstr "发现主机概述"
 
+msgid "Actions"
+msgstr "操作"
+
 msgid "Assign Location"
 msgstr "指定位置"
 
@@ -47,6 +50,9 @@ msgstr "自动置备"
 msgid "Auto provisioning"
 msgstr "自动置备"
 
+msgid "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
+msgstr ""
+
 msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr "自动生成 PXE 配置，以将新发现主机固定至发现"
 
@@ -74,6 +80,9 @@ msgstr "置备期间清除所有报告的详情（发现详情除外）"
 msgid "Collapse All"
 msgstr "隐藏全部"
 
+msgid "Command line options for kexec during PXE-less provisioning."
+msgstr ""
+
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "无法从代理 %{url} 获得详情：%{error}"
 
@@ -89,6 +98,9 @@ msgstr "创建一个用于测试的发现主机（使用 /详情创建新主机
 msgid "Create a discovery rule"
 msgstr "创建发现规则"
 
+msgid "Create bond interfaces"
+msgstr ""
+
 msgid "Customize Host"
 msgstr "自定义主机"
 
@@ -161,6 +173,9 @@ msgstr "发现规则"
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
 msgstr ""
 
+msgid "Discovery hostname naming pattern"
+msgstr ""
+
 msgid "Discovery location"
 msgstr "发现位置"
 
@@ -230,6 +245,9 @@ msgstr "期望的 discovery_fact '%s' 缺失，无法检测主接口和设置主
 msgid "Extra facter columns to show in host lists (separate by comma)"
 msgstr "在主机列表中显示的额外 facter 列（用逗号隔开）"
 
+msgid "Fact + prefix"
+msgstr ""
+
 msgid "Fact columns"
 msgstr "详情列"
 
@@ -369,6 +387,9 @@ msgstr "无效详情：hash 不包含 discovery_hostname 设置中任何详情
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "无效的主机名：无法标准化主机名"
 
+msgid "Invalid user type of %s was provided"
+msgstr ""
+
 msgid "Kernel kexec URL is invalid: '%s'"
 msgstr "内核 kexec URL 无效：'%s'"
 
@@ -414,6 +435,9 @@ msgstr "锁定的 PXELinux 模板名称"
 msgid "MAC address"
 msgstr "MAC 地址"
 
+msgid "MAC-based name"
+msgstr ""
+
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
 msgstr "按照此规则置备的最大主机数（0 = 没有限制）"
 
@@ -426,9 +450,6 @@ msgstr "杂项"
 msgid "Model"
 msgstr "型号"
 
-msgid "Must specify a user with email enabled"
-msgstr "必须指定一个启用了电子邮件的用户"
-
 msgid "N/A"
 msgstr "N/A"
 
@@ -513,6 +534,9 @@ msgstr "置备 %s"
 msgid "Provision a discovered host"
 msgstr "置备发现主机"
 
+msgid "Random name"
+msgstr ""
+
 msgid "Reboot"
 msgstr "重启"
 
@@ -645,6 +669,9 @@ msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
 msgid "Type"
 msgstr "类型"
 
+msgid "Type of name generator"
+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

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 13.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-15 11:25+0200\n"
-"PO-Revision-Date: 2018-06-15 10:50+0000\n"
-"Last-Translator: Dominic Cleal <dominic@cleal.org>\n"
+"POT-Creation-Date: 2018-10-25 13:56+0200\n"
+"PO-Revision-Date: 2018-10-25 20:13+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,11 +195,11 @@ msgstr ""
 msgid "Create a discovery rule"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:52
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:53
 msgid "Update a rule"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:60
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:61
 msgid "Delete a rule"
 msgstr ""
 
@@ -215,11 +215,11 @@ msgstr ""
 msgid "No hostgroup associated with rule '%s'"
 msgstr ""
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:71
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
 msgid "Errors during reboot: %s"
 msgstr ""
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:89
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
 msgid "No discovered hosts to reboot"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr "刷新詳情"
 
 #: ../app/helpers/discovered_hosts_helper.rb:16
 #: ../app/helpers/discovered_hosts_helper.rb:30
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:24
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr "重新開機"
@@ -428,72 +428,84 @@ msgstr ""
 msgid "Delete rule '%s'?"
 msgstr ""
 
-#: ../app/mailers/discovered_mailer.rb:4
-msgid "Must specify a user with email enabled"
-msgstr "必須指定一位啟用了電子郵件的使用者"
+#: ../app/mailers/discovered_mailer.rb:9
+msgid "Invalid user type of %s was provided"
+msgstr ""
 
-#: ../app/mailers/discovered_mailer.rb:15
+#: ../app/mailers/discovered_mailer.rb:26
 msgid "Discovered hosts summary"
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:10
+#: ../app/models/discovery_rule.rb:11
 msgid "can't contain white spaces."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:12
+#: ../app/models/discovery_rule.rb:13
 msgid "must start with a letter or ERB."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:15
+#: ../app/models/discovery_rule.rb:16
 msgid "must be present."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:48
+#: ../app/models/discovery_rule.rb:53
 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] ""
 
-#: ../app/models/discovery_rule.rb:54
+#: ../app/models/discovery_rule.rb:59
 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] ""
 
-#: ../app/models/host/discovered.rb:51
-msgid "Invalid facts, must be a Hash"
+#: ../app/models/host/discovered.rb:45
+msgid "Fact + prefix"
+msgstr ""
+
+#: ../app/models/host/discovered.rb:46
+msgid "Random name"
+msgstr ""
+
+#: ../app/models/host/discovered.rb:47
+msgid "MAC-based name"
 msgstr ""
 
 #: ../app/models/host/discovered.rb:56
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+#: ../app/models/host/discovered.rb:61
 msgid ""
 "Expected discovery_fact '%s' is missing, unable to detect primary interface "
 "and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:63
+#: ../app/models/host/discovered.rb:74
 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:89
+#: ../app/models/host/discovered.rb:100
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:212
+#: ../app/models/host/discovered.rb:155
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:220
+#: ../app/models/host/discovered.rb:163
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:228
+#: ../app/models/host/discovered.rb:171
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:247
+#: ../app/models/host/discovered.rb:190
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -530,164 +542,182 @@ msgid "Interface fact"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:20
-msgid "Clean all reported facts during provisioning (except discovery facts)"
+msgid ""
+"Automatic bond interface (if another interface is detected on the same VLAN "
+"via LLDP)"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:20
-msgid "Clean all facts"
+msgid "Create bond interfaces"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:21
-msgid "List of facts to use for the hostname (separated by comma, first wins)"
+msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:21
-msgid "Hostname facts"
+msgid "Clean all facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
+msgid "List of facts to use for the hostname (separated by comma, first wins)"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:22
+msgid "Hostname facts"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:23
 msgid ""
 "Automatically provision newly discovered hosts, according to the "
 "provisioning rules"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:23
 msgid "Auto provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:24
 msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:25
 msgid "The default prefix to use for the host name, must start with a letter"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:25
 msgid "Hostname prefix"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:26
 msgid "Extra facter columns to show in host lists (separate by comma)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:26
 msgid "Fact columns"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:27
 msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:27
 msgid "Highlighted facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:28
 msgid "Regex to organize facts for storage section"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:28
 msgid "Storage facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:29
 msgid "Regex to organize facts for software section"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:29
 msgid "Software facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:30
 msgid "Regex to organize facts for hardware section"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:30
 msgid "Hardware facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:31
 msgid "Regex to organize facts for network section"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:31
 msgid "Network facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:32
 msgid "Regex to organize facts for ipmi section"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:32
 msgid "IPMI facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:33
 msgid ""
 "Automatically generate PXE configuration to pin a newly discovered host to "
 "discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:33
 msgid "Lock PXE"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:34
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:34
 msgid "Locked PXELinux template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:35
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:35
 msgid "Locked PXEGrub template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:36
 msgid "PXEGrub2 template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:36
 msgid "Locked PXEGrub2 template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:37
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:37
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:38
 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
+#: ../app/models/setting/discovered.rb:38
 msgid "Error on existing NIC"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:44
+#: ../app/models/setting/discovered.rb:39
+msgid "Discovery hostname naming pattern"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:39
+msgid "Type of name generator"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:46
 msgid "The default location to place discovered hosts in"
 msgstr "放置已發現之主機的預設位置"
 
-#: ../app/models/setting/discovered.rb:44
+#: ../app/models/setting/discovered.rb:46
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:52
+#: ../app/models/setting/discovered.rb:54
 msgid "The default organization to place discovered hosts in"
 msgstr "放置已發現之主機的預設組織"
 
-#: ../app/models/setting/discovered.rb:52
+#: ../app/models/setting/discovered.rb:54
 msgid "Discovery organization"
 msgstr ""
 
@@ -798,6 +828,11 @@ msgstr "子網路"
 msgid "Last Facts Upload"
 msgstr ""
 
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:24
+#: ../app/views/discovery_rules/index.html.erb:12
+msgid "Actions"
+msgstr "動作"
+
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:60
 msgid "Please Confirm"
 msgstr "請確認"
@@ -1012,6 +1047,10 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr ""
 
+#: ../db/seeds.d/50_discovery_templates.rb:5
+msgid "Command line options for kexec during PXE-less provisioning."
+msgstr ""
+
 #: ../db/seeds.d/70_discovery_mail_notification.rb:3
 msgid "A summary of discovered hosts"
 msgstr ""