foreman_discovery 14.0.1 → 15.0.0

data/locale/en/foreman_discovery.po

@@ -138,9 +138,6 @@ msgstr ""
 msgid "Discovered host: %s"
 msgstr ""
 
-msgid "Discovered hosts"
-msgstr ""
-
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
@@ -177,9 +174,6 @@ msgstr ""
 msgid "Discovery organization"
 msgstr ""
 
-msgid "Discovery rules"
-msgstr ""
-
 msgid "DiscoveryRule|Enabled"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.edit.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-05 08:34+0100\n"
-"PO-Revision-Date: 2018-10-30 12:54+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"POT-Creation-Date: 2019-04-18 13:34+0200\n"
+"PO-Revision-Date: 2019-04-18 19:36+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,15 +216,15 @@ msgstr "List all fact values of a given discovered host"
 msgid "Unable to find a discovery rule, no host provided (check permissions)"
 msgstr "Unable to find a discovery rule, no host provided (check permissions)"
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:47
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:43
 msgid "No hostgroup associated with rule '%s'"
 msgstr "No hostgroup associated with rule '%s'"
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:69
 msgid "Errors during reboot: %s"
 msgstr "Errors during reboot: %s"
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:87
 msgid "No discovered hosts to reboot"
 msgstr "No discovered hosts to reboot"
 
@@ -334,19 +334,19 @@ msgstr "%s ago"
 
 #: ../app/helpers/discovered_hosts_helper.rb:14
 #: ../app/helpers/discovered_hosts_helper.rb:29
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
 msgid "Auto Provision"
 msgstr "Auto Provision"
 
 #: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
 msgid "Refresh facts"
 msgstr "Refresh facts"
 
 #: ../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:48
+#: ../app/models/setting/discovered.rb:26
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -360,7 +360,7 @@ msgid "Select Action"
 msgstr "Select Action"
 
 #: ../app/helpers/discovered_hosts_helper.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
 msgid "Delete %s?"
 msgstr "Delete %s?"
 
@@ -405,6 +405,7 @@ msgstr "Provision"
 #: ../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:158
 #: ../lib/foreman_discovery/engine.rb:173
 msgid "Discovered Hosts"
 msgstr "Discovered Hosts"
@@ -453,7 +454,7 @@ msgstr "must start with a letter or ERB."
 msgid "must be present."
 msgstr "must be present."
 
-#: ../app/models/discovery_rule.rb:53
+#: ../app/models/discovery_rule.rb:52
 msgid ""
 "Host group organization %s must also be associated to the discovery rule"
 msgid_plural ""
@@ -461,58 +462,58 @@ msgid_plural ""
 msgstr[0] "Host group organisation %s must also be associated to the discovery rule"
 msgstr[1] "Host group organisations %s must also be associated to the discovery rule"
 
-#: ../app/models/discovery_rule.rb:59
+#: ../app/models/discovery_rule.rb:56
 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] "Host group location %s must also be associated to the discovery rule"
 msgstr[1] "Host group locations %s must also be associated to the discovery rule"
 
-#: ../app/models/host/discovered.rb:45
+#: ../app/models/host/discovered.rb:41
 msgid "Fact + prefix"
 msgstr "Fact + prefix"
 
-#: ../app/models/host/discovered.rb:46
+#: ../app/models/host/discovered.rb:42
 msgid "Random name"
 msgstr "Random name"
 
-#: ../app/models/host/discovered.rb:47
+#: ../app/models/host/discovered.rb:43
 msgid "MAC-based name"
 msgstr "MAC-based name"
 
-#: ../app/models/host/discovered.rb:56
+#: ../app/models/host/discovered.rb:52
 msgid "Invalid facts, must be a Hash"
 msgstr "Invalid facts, must be a Hash"
 
-#: ../app/models/host/discovered.rb:61
+#: ../app/models/host/discovered.rb:57
 msgid ""
 "Expected discovery_fact '%s' is missing, unable to detect primary interface "
 "and set hostname"
 msgstr "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 
-#: ../app/models/host/discovered.rb:74
+#: ../app/models/host/discovered.rb:70
 msgid ""
 "Invalid facts: hash does not contain a valid value for any of the facts in "
 "the discovery_hostname setting: %s"
 msgstr "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:100
+#: ../app/models/host/discovered.rb:96
 msgid "Facts could not be imported"
 msgstr "Facts could not be imported"
 
-#: ../app/models/host/discovered.rb:155
+#: ../app/models/host/discovered.rb:151
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Could not get facts from proxy %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:163
+#: ../app/models/host/discovered.rb:159
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "Unable to reboot %{name} via %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:171
+#: ../app/models/host/discovered.rb:167
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "Unable to perform kexec on %{name} via %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:186
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Invalid hostname: Could not normalise the hostname"
 
@@ -541,193 +542,193 @@ msgid "Rebuild DNS for %s"
 msgstr "Rebuild DNS for %s"
 
 #: ../app/models/setting/discovered.rb:19
+msgid "The default location to place discovered hosts in"
+msgstr "The default location to place discovered hosts in"
+
+#: ../app/models/setting/discovered.rb:19
+msgid "Discovery location"
+msgstr "Discovery location"
+
+#: ../app/models/setting/discovered.rb:20
+msgid "The default organization to place discovered hosts in"
+msgstr "The default organisation to place discovered hosts in"
+
+#: ../app/models/setting/discovered.rb:20
+msgid "Discovery organization"
+msgstr "Discovery organisation"
+
+#: ../app/models/setting/discovered.rb:21
 msgid "Fact name to use for primary interface detection"
 msgstr "Fact name to use for primary interface detection"
 
-#: ../app/models/setting/discovered.rb:19
+#: ../app/models/setting/discovered.rb:21
 msgid "Interface fact"
 msgstr "Interface fact"
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:22
 msgid ""
 "Automatic bond interface (if another interface is detected on the same VLAN "
 "via LLDP)"
 msgstr "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:22
 msgid "Create bond interfaces"
 msgstr "Create bond interfaces"
 
-#: ../app/models/setting/discovered.rb:21
+#: ../app/models/setting/discovered.rb:23
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr "Clean all reported facts during provisioning (except discovery facts)"
 
-#: ../app/models/setting/discovered.rb:21
+#: ../app/models/setting/discovered.rb:23
 msgid "Clean all facts"
 msgstr "Clean all facts"
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:24
 msgid "List of facts to use for the hostname (separated by comma, first wins)"
 msgstr "List of facts to use for the hostname (separated by comma, first wins)"
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:24
 msgid "Hostname facts"
 msgstr "Hostname facts"
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:25
 msgid ""
 "Automatically provision newly discovered hosts, according to the "
 "provisioning rules"
 msgstr "Automatically provision newly discovered hosts, according to the provisioning rules"
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:25
 msgid "Auto provisioning"
 msgstr "Auto provisioning"
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:26
 msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr "Automatically reboot or kexec discovered host during provisioning"
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:27
 msgid "The default prefix to use for the host name, must start with a letter"
 msgstr "The default prefix to use for the host name, must start with a letter"
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:27
 msgid "Hostname prefix"
 msgstr "Hostname prefix"
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:28
 msgid "Extra facter columns to show in host lists (separate by comma)"
 msgstr "Extra facter columns to show in host lists (separate by comma)"
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:28
 msgid "Fact columns"
 msgstr "Fact columns"
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:29
 msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
 msgstr "Regex to organise facts for highlights section - e.g. ^(abc|cde)$"
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:29
 msgid "Highlighted facts"
 msgstr "Highlighted facts"
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:30
 msgid "Regex to organize facts for storage section"
 msgstr "Regex to organise facts for storage section"
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:30
 msgid "Storage facts"
 msgstr "Storage facts"
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:31
 msgid "Regex to organize facts for software section"
 msgstr "Regex to organise facts for software section"
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:31
 msgid "Software facts"
 msgstr "Software facts"
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:32
 msgid "Regex to organize facts for hardware section"
 msgstr "Regex to organise facts for hardware section"
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:32
 msgid "Hardware facts"
 msgstr "Hardware facts"
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:33
 msgid "Regex to organize facts for network section"
 msgstr "Regex to organise facts for network section"
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:33
 msgid "Network facts"
 msgstr "Network facts"
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:34
 msgid "Regex to organize facts for ipmi section"
 msgstr "Regex to organise facts for IPMI section"
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:34
 msgid "IPMI facts"
 msgstr "IPMI facts"
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:35
 msgid ""
 "Automatically generate PXE configuration to pin a newly discovered host to "
 "discovery"
 msgstr "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:35
 msgid "Lock PXE"
 msgstr "Lock PXE"
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:36
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr "PXELinux template to be used when pinning a host to discovery"
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:36
 msgid "Locked PXELinux template name"
 msgstr "Locked PXELinux template name"
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:37
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr "PXEGrub template to be used when pinning a host to discovery"
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:37
 msgid "Locked PXEGrub template name"
 msgstr "Locked PXEGrub template name"
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:38
 msgid "PXEGrub2 template to be used when pinning a host to discovery"
 msgstr "PXEGrub2 template to be used when pinning a host to discovery"
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:38
 msgid "Locked PXEGrub2 template name"
 msgstr "Locked PXEGrub2 template name"
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:39
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr "Force DNS entries creation when provisioning discovered host"
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:39
 msgid "Force DNS"
 msgstr "Force DNS"
 
-#: ../app/models/setting/discovered.rb:38
+#: ../app/models/setting/discovered.rb:40
 msgid ""
 "Do not allow to discover existing managed host matching MAC of a "
 "provisioning NIC (errors out early)"
 msgstr "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
 
-#: ../app/models/setting/discovered.rb:38
+#: ../app/models/setting/discovered.rb:40
 msgid "Error on existing NIC"
 msgstr "Error on existing NIC"
 
-#: ../app/models/setting/discovered.rb:39
+#: ../app/models/setting/discovered.rb:41
 msgid "Discovery hostname naming pattern"
 msgstr "Discovery hostname naming pattern"
 
-#: ../app/models/setting/discovered.rb:39
+#: ../app/models/setting/discovered.rb:41
 msgid "Type of name generator"
 msgstr "Type of name generator"
 
-#: ../app/models/setting/discovered.rb:46
-msgid "The default location to place discovered hosts in"
-msgstr "The default location to place discovered hosts in"
-
-#: ../app/models/setting/discovered.rb:46
-msgid "Discovery location"
-msgstr "Discovery location"
-
-#: ../app/models/setting/discovered.rb:54
-msgid "The default organization to place discovered hosts in"
-msgstr "The default organisation to place discovered hosts in"
-
-#: ../app/models/setting/discovered.rb:54
-msgid "Discovery organization"
-msgstr "Discovery organisation"
-
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
 msgstr "Discovery fact parser does not work with non-discovery host '%{host}'"
@@ -817,38 +818,38 @@ msgstr "Disk Count"
 msgid "Disks Size"
 msgstr "Disks Size"
 
-#: ../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:16
+#: ../app/views/discovered_hosts/_selected_hosts.html.erb:9
 msgid "Location"
 msgstr "Location"
 
-#: ../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:17
+#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:22
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Subnet"
 msgstr "Subnet"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:23
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
 msgid "Last Facts Upload"
 msgstr "Last Facts Upload"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:24
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
 #: ../app/views/discovery_rules/index.html.erb:12
 msgid "Actions"
 msgstr "Actions"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:60
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:52
 msgid "Please Confirm"
 msgstr "Please Confirm"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:66
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:67
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:59
 msgid "Submit"
 msgstr "Submit"
 
@@ -1019,6 +1020,7 @@ msgid "Edit %s"
 msgstr "Edit %s"
 
 #: ../app/views/discovery_rules/index.html.erb:1
+#: ../lib/foreman_discovery/engine.rb:163
 msgid "Discovery Rules"
 msgstr "Discovery Rules"
 
@@ -1074,14 +1076,6 @@ msgstr "One or more hosts have been discovered"
 msgid "Details"
 msgstr "Details"
 
-#: ../lib/foreman_discovery/engine.rb:158
-msgid "Discovered hosts"
-msgstr "Discovered hosts"
-
-#: ../lib/foreman_discovery/engine.rb:163
-msgid "Discovery rules"
-msgstr "Discovery rules"
-
 #: ../lib/foreman_discovery/engine.rb:179
 msgid "Discovery Kexec template"
 msgstr "Discovery Kexec template"