foreman_discovery 10.0.0 → 11.0.0

data/locale/en/foreman_discovery.edit.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.0\n"
+"Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -80,7 +80,7 @@ msgstr ""
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:123 ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:123 ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 msgid "Unable to provision %{host}: %{errors}"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:132 ../app/controllers/discovered_hosts_controller.rb:159
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:132 ../app/controllers/discovered_hosts_controller.rb:157
 msgid "No rule found for host %s"
 msgstr ""
 
@@ -96,11 +96,11 @@ msgstr ""
 msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:143 ../app/controllers/discovered_hosts_controller.rb:165
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:143 ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:146 ../app/controllers/discovered_hosts_controller.rb:168
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:146 ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No discovered hosts to provision"
 msgstr ""
 
@@ -160,15 +160,23 @@ msgstr ""
 msgid "flag is used for temporary shutdown of rules"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:43
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:39
+msgid "location ID for provisioned hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:40
+msgid "organization ID for provisioned hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:44
 msgid "Create a discovery rule"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:51
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:52
 msgid "Update a rule"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:59
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:60
 msgid "Delete a rule"
 msgstr ""
 
@@ -228,59 +236,59 @@ msgstr ""
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:140
 msgid "Destroyed selected hosts"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:144
+#: ../app/controllers/discovered_hosts_controller.rb:142
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:156
+#: ../app/controllers/discovered_hosts_controller.rb:154
 msgid "Failed to auto provision host %s: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:184
+#: ../app/controllers/discovered_hosts_controller.rb:182
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:290
+#: ../app/controllers/discovered_hosts_controller.rb:291
 msgid "No hosts were found with that id or name"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:294
+#: ../app/controllers/discovered_hosts_controller.rb:295
 msgid "No hosts selected"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:300
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "Something went wrong while selecting hosts - %s"
 msgstr ""
 
@@ -360,7 +368,7 @@ msgstr ""
 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:167
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -416,59 +424,59 @@ msgid_plural "Host group locations %s must also be associated to the discovery r
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/models/host/discovered.rb:37
+#: ../app/models/host/discovered.rb:43
 msgid "Invalid facts, must be a Hash"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:42
+#: ../app/models/host/discovered.rb:48
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:49
+#: ../app/models/host/discovered.rb:55
 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:66
+#: ../app/models/host/discovered.rb:72
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:133
+#: ../app/models/host/discovered.rb:139
 msgid "Unable to assign subnet, primary interface is missing IP address"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:196
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:198
+#: ../app/models/host/discovered.rb:204
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:206
+#: ../app/models/host/discovered.rb:212
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:231
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:20
+#: ../app/models/host/managed_extensions.rb:23
 msgid "Reloading kernel on %s"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:22
+#: ../app/models/host/managed_extensions.rb:25
 msgid "Rebooting %s"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:43
+#: ../app/models/host/managed_extensions.rb:46
 msgid "Kexec template not associated with operating system"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:48
+#: ../app/models/host/managed_extensions.rb:51
 msgid "Kernel kexec URL is invalid: '%s'"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:49
+#: ../app/models/host/managed_extensions.rb:52
 msgid "Init RAM kexec URL is invalid: '%s'"
 msgstr ""
 
@@ -928,26 +936,26 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:151
+#: ../lib/foreman_discovery/engine.rb:152
 msgid "Discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:156
+#: ../lib/foreman_discovery/engine.rb:157
 msgid "Discovery rules"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:172
+#: ../lib/foreman_discovery/engine.rb:173
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:181
+#: ../lib/foreman_discovery/engine.rb:182
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:182
+#: ../lib/foreman_discovery/engine.rb:183
 msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:183
+#: ../lib/foreman_discovery/engine.rb:184
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""

data/locale/en/foreman_discovery.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.0\n"
+"Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -685,6 +685,9 @@ msgstr ""
 msgid "items selected. Uncheck to Clear"
 msgstr ""
 
+msgid "location ID for provisioned hosts"
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr ""
 
@@ -697,6 +700,9 @@ msgstr ""
 msgid "number of entries per request"
 msgstr ""
 
+msgid "organization ID for provisioned hosts"
+msgstr ""
+
 msgid "paginate results"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.edit.po

@@ -10,11 +10,11 @@
 # Lukáš Zapletal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.0\n"
+"Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-17 23:23+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"POT-Creation-Date: 2017-12-11 10:28+0100\n"
+"PO-Revision-Date: 2017-12-25 01:46+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\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"
@@ -53,7 +53,7 @@ msgstr "Show a discovered host"
 #: ../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 ""
+msgstr "DHCP filename option (Grub2 or PXELinux by default)"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:41
 msgid "Create a discovered host for testing (use /facts to create new hosts)"
@@ -102,7 +102,7 @@ msgid "Execute rules against a discovered host"
 msgstr "Execute rules against a discovered host"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:123
-#: ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "Host %{host} was provisioned with rule %{rule}"
 
@@ -111,7 +111,7 @@ msgid "Unable to provision %{host}: %{errors}"
 msgstr "Unable to provision %{host}: %{errors}"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:132
-#: ../app/controllers/discovered_hosts_controller.rb:159
+#: ../app/controllers/discovered_hosts_controller.rb:157
 msgid "No rule found for host %s"
 msgstr "No rule found for host %s"
 
@@ -120,12 +120,12 @@ msgid "Execute rules against all currently discovered hosts"
 msgstr "Execute rules against all currently discovered hosts"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:143
-#: ../app/controllers/discovered_hosts_controller.rb:165
+#: ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Errors during auto provisioning: %s"
 msgstr "Errors during auto provisioning: %s"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:146
-#: ../app/controllers/discovered_hosts_controller.rb:168
+#: ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No discovered hosts to provision"
 msgstr "No discovered hosts to provision"
 
@@ -188,15 +188,23 @@ msgstr "puts the rules in order, low numbers go first. Must be greater then zero
 msgid "flag is used for temporary shutdown of rules"
 msgstr "flag is used for temporary shutdown of rules"
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:43
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:39
+msgid "location ID for provisioned hosts"
+msgstr "location ID for provisioned hosts"
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:40
+msgid "organization ID for provisioned hosts"
+msgstr "organisation ID for provisioned hosts"
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:44
 msgid "Create a discovery rule"
 msgstr "Create a discovery rule"
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:51
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:52
 msgid "Update a rule"
 msgstr "Update a rule"
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:59
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:60
 msgid "Delete a rule"
 msgstr "Delete a rule"
 
@@ -256,59 +264,59 @@ msgstr "Failed to reboot host %{hostname} with error %{error_message}"
 msgid "Failed to reboot hosts with error %s"
 msgstr "Failed to reboot hosts with error %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:140
 msgid "Destroyed selected hosts"
 msgstr "Destroyed selected hosts"
 
-#: ../app/controllers/discovered_hosts_controller.rb:144
+#: ../app/controllers/discovered_hosts_controller.rb:142
 msgid "The following hosts were not deleted: %s"
 msgstr "The following hosts were not deleted: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:156
+#: ../app/controllers/discovered_hosts_controller.rb:154
 msgid "Failed to auto provision host %s: %s"
 msgstr "Failed to auto provision host %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:184
+#: ../app/controllers/discovered_hosts_controller.rb:182
 msgid "Discovered hosts are provisioning now"
 msgstr "Discovered hosts are provisioning now"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Highlights"
 msgstr "Highlights"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Storage"
 msgstr "Storage"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Network"
 msgstr "Network"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Software"
 msgstr "Software"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "IPMI"
 msgstr "IPMI"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../app/controllers/discovered_hosts_controller.rb:290
+#: ../app/controllers/discovered_hosts_controller.rb:291
 msgid "No hosts were found with that id or name"
 msgstr "No hosts were found with that id or name"
 
-#: ../app/controllers/discovered_hosts_controller.rb:294
+#: ../app/controllers/discovered_hosts_controller.rb:295
 msgid "No hosts selected"
 msgstr "No hosts selected"
 
-#: ../app/controllers/discovered_hosts_controller.rb:300
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Something went wrong while selecting hosts - %s"
 
@@ -498,23 +506,23 @@ msgstr "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Invalid hostname: Could not normalise the hostname"
 
-#: ../app/models/host/managed_extensions.rb:20
+#: ../app/models/host/managed_extensions.rb:23
 msgid "Reloading kernel on %s"
 msgstr "Reloading kernel on %s"
 
-#: ../app/models/host/managed_extensions.rb:22
+#: ../app/models/host/managed_extensions.rb:25
 msgid "Rebooting %s"
 msgstr "Rebooting %s"
 
-#: ../app/models/host/managed_extensions.rb:43
+#: ../app/models/host/managed_extensions.rb:46
 msgid "Kexec template not associated with operating system"
 msgstr "Kexec template not associated with operating system"
 
-#: ../app/models/host/managed_extensions.rb:48
+#: ../app/models/host/managed_extensions.rb:51
 msgid "Kernel kexec URL is invalid: '%s'"
 msgstr "Kernel kexec URL is invalid: '%s'"
 
-#: ../app/models/host/managed_extensions.rb:49
+#: ../app/models/host/managed_extensions.rb:52
 msgid "Init RAM kexec URL is invalid: '%s'"
 msgstr "Init RAM kexec URL is invalid: '%s'"
 
@@ -728,7 +736,7 @@ msgstr "Memory"
 
 #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
 msgid "Customize Host"
-msgstr ""
+msgstr "Customise Host"
 
 #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
 msgid "Create Host"
@@ -845,17 +853,17 @@ msgstr "IP address"
 
 #: ../app/views/discovered_hosts/welcome.html.erb:7
 msgid "No discovered hosts found in this context."
-msgstr ""
+msgstr "No discovered hosts found in this context."
 
 #: ../app/views/discovered_hosts/welcome.html.erb:8
 msgid ""
 "This page shows discovered bare-metal or virtual nodes waiting to be "
 "provisioned."
-msgstr ""
+msgstr "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
 msgid "Learn more about this in the documentation."
-msgstr ""
+msgstr "Learn more about this in the documentation."
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
 msgid "Summary report for discovered hosts from Foreman"