foreman_discovery 11.0.0 → 12.0.0

data/locale/ru/foreman_discovery.po

@@ -51,9 +51,6 @@ msgstr "Сопоставленные узлы"
 msgid "Auto Provision"
 msgstr "Автоматическая подготовка"
 
-msgid "Auto Provision All"
-msgstr "Автоматически подготовить все"
-
 msgid "Auto provisioning"
 msgstr ""
 
@@ -81,6 +78,9 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Collapse All"
+msgstr ""
+
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Не удалось получить факты с %{url}: %{error}"
 
@@ -102,6 +102,9 @@ msgstr ""
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr "Удалить %s?"
 
@@ -111,9 +114,6 @@ msgstr "Удалить обнаруженный узел"
 msgid "Delete a rule"
 msgstr "Удалить правило"
 
-msgid "Delete hosts"
-msgstr "Удалить узлы"
-
 msgid "Delete rule '%s'?"
 msgstr "Удалить правило «%s»?"
 
@@ -132,6 +132,9 @@ msgstr "Отключить правило «%s»?"
 msgid "Discovered Hosts"
 msgstr "Обнаруженные узлы"
 
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "Обнаружен узел: %s"
 
@@ -162,6 +165,9 @@ msgstr ""
 msgid "Discovery Rules"
 msgstr "Правила обнаружения"
 
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
 msgid "Discovery location"
 msgstr ""
 
@@ -195,11 +201,14 @@ msgstr ""
 msgid "Disks size"
 msgstr "Размер диска"
 
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
 msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
-msgid "Edit Discovery Rule"
-msgstr "Изменить правило"
+msgid "Edit %s"
+msgstr ""
 
 msgid "Enable"
 msgstr "Включить"
@@ -207,6 +216,9 @@ msgstr "Включить"
 msgid "Enable rule '%s'?"
 msgstr "Включить правило «%s»?"
 
+msgid "Error on existing NIC"
+msgstr ""
+
 msgid "Errors during auto provisioning: %s"
 msgstr "Ошибки при автоматической подготовке: %s"
 
@@ -219,9 +231,6 @@ msgstr "Применить правила к обнаруженному узлу
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Применить правила ко всем обнаруженным узлам"
 
-msgid "Expand All"
-msgstr "Развернуть все"
-
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "Отсутствует факт «%s»: невозможно определить основной интерфейс и имя узла"
 
@@ -518,9 +527,6 @@ msgstr "Подготовить обнаруженный узел"
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-msgid "Reboot All"
-msgstr "Перезагрузить все"
-
 msgid "Rebooting %s"
 msgstr "Перезагрузка %s"
 
@@ -653,15 +659,12 @@ msgstr "Тип"
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "UUID для отслеживания состояния задач оркестрации, GET /api/orchestration/:UUID/tasks"
 
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr "Не удалось выбрать подсеть: не определен IP-адрес основного интерфейса"
-
-msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
-msgstr "Не удалось обнаружить основной интерфейс с MAC-адресом %{mac}, полученным из факта «%{fact}»"
-
 msgid "Unable to find a discovery rule, no host provided (check permissions)"
 msgstr "Не удалось найти правило: необходимо указать узел. Проверьте разрешения."
 
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "Не удалось выполнить kexec на %{name} с %{url}: %{msg}"
 
@@ -704,6 +707,9 @@ msgstr "выбрано. Чтобы очистить, снимите флажок
 msgid "location ID for provisioned hosts"
 msgstr ""
 
+msgid "must be present."
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr "должен начинаться с буквы или ERB"
 

data/locale/sv_SE/foreman_discovery.edit.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_discovery package.
-# 
+#
 # Translators:
 # Dominic Cleal <dominic@cleal.org>, 2014
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 10:28+0100\n"
 "PO-Revision-Date: 2017-12-11 11:31+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
+"uage/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,23 +24,19 @@ msgstr ""
 msgid "List all discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
 msgid "filter results"
 msgstr "filtrera resultat"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
 msgid "sort results"
 msgstr "sortera resultat"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
+#: ../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 "antal poster per begäran"
 
@@ -48,8 +44,7 @@ msgstr "antal poster per begäran"
 msgid "Show a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
+#: ../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 ""
 
@@ -70,14 +65,11 @@ msgid "not required if it's a virtual machine"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
-msgid ""
-"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
-msgid ""
-"required if value is not inherited from host group or default password in "
-"settings"
+msgid "required if value is not inherited from host group or default password in settings"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
@@ -89,62 +81,54 @@ msgid "Upload facts for a host, creating the host if required"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
-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)"
+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 ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:123
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122 ../app/controllers/discovered_hosts_controller.rb:159
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
 msgid "Unable to provision %{host}: %{errors}"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:132
-#: ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131 ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No rule found for host %s"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:139
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
 msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:143
-#: ../app/controllers/discovered_hosts_controller.rb:163
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142 ../app/controllers/discovered_hosts_controller.rb:172
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:146
-#: ../app/controllers/discovered_hosts_controller.rb:166
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "No discovered hosts to provision"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:168
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
 msgid "%s discovered hosts were provisioned"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:179
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
 msgid "Refreshing the facts of a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:188
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
 msgid "Rebooting a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:197
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
 msgid "Rebooting all discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:208
-#: ../app/controllers/discovered_hosts_controller.rb:125
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207 ../app/controllers/discovered_hosts_controller.rb:128
 msgid "Discovered hosts are rebooting now"
 msgstr ""
 
@@ -169,8 +153,7 @@ msgid "the hostgroup that is used to auto provision a host"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
-msgid ""
-"defines a pattern to assign human-readable hostnames to the matching hosts"
+msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -178,8 +161,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
-msgid ""
-"puts the rules in order, low numbers go first. Must be greater then zero"
+msgid "puts the rules in order, low numbers go first. Must be greater then zero"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -226,95 +208,95 @@ msgstr ""
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:61
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:93
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Facts refreshed for %s"
 msgstr "Fakta uppdaterade för %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:95
+#: ../app/controllers/discovered_hosts_controller.rb:98
 msgid "Failed to refresh facts for %s"
 msgstr "Misslyckades med att uppdatera fakta för %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:98
+#: ../app/controllers/discovered_hosts_controller.rb:101
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:105
+#: ../app/controllers/discovered_hosts_controller.rb:108
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Rebooting host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:111
+#: ../app/controllers/discovered_hosts_controller.rb:114
 msgid "Failed to reboot host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:114
+#: ../app/controllers/discovered_hosts_controller.rb:117
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:128
+#: ../app/controllers/discovered_hosts_controller.rb:131
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:140
+#: ../app/controllers/discovered_hosts_controller.rb:149
 msgid "Destroyed selected hosts"
 msgstr "Förstör markerade värdar"
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:151
 msgid "The following hosts were not deleted: %s"
 msgstr "Följande värdar raderades inte: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:154
+#: ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Failed to auto provision host %s: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:182
+#: ../app/controllers/discovered_hosts_controller.rb:191
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:214
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:291
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "No hosts were found with that id or name"
 msgstr "Inga värdar med det idt eller namnet hittades"
 
-#: ../app/controllers/discovered_hosts_controller.rb:295
+#: ../app/controllers/discovered_hosts_controller.rb:305
 msgid "No hosts selected"
 msgstr "Inga värdar markerade"
 
-#: ../app/controllers/discovered_hosts_controller.rb:301
+#: ../app/controllers/discovered_hosts_controller.rb:311
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Något blev fel vid markering av värdar - %s"
 
@@ -330,19 +312,15 @@ msgstr ""
 msgid "%s ago"
 msgstr "%s sedan"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
 msgid "Auto Provision"
 msgstr ""
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
 msgid "Refresh facts"
 msgstr "Uppdatera fakta"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16
-#: ../app/models/setting/discovered.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr ""
 
@@ -350,62 +328,51 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:37
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
 msgid "Select Action"
 msgstr "Välj Åtgärd"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23
-msgid "Expand All"
-msgstr ""
-
-#: ../app/helpers/discovered_hosts_helper.rb:27
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
 msgid "Delete %s?"
 msgstr "Radera %s?"
 
-#: ../app/helpers/discovered_hosts_helper.rb:33
-msgid "Delete hosts"
-msgstr "Radera värdar"
-
-#: ../app/helpers/discovered_hosts_helper.rb:34
+#: ../app/helpers/discovered_hosts_helper.rb:31
 msgid "Assign Organization"
 msgstr "Tilldela Organisation"
 
-#: ../app/helpers/discovered_hosts_helper.rb:35
+#: ../app/helpers/discovered_hosts_helper.rb:32
 msgid "Assign Location"
 msgstr "Tilldela Plats"
 
-#: ../app/helpers/discovered_hosts_helper.rb:39
+#: ../app/helpers/discovered_hosts_helper.rb:33
+msgid "Delete"
+msgstr ""
+
+#: ../app/helpers/discovered_hosts_helper.rb:37
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - Följande värdar kommer att ändras"
 
-#: ../app/helpers/discovered_hosts_helper.rb:48
-#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
+#: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
 msgstr "N/A"
 
-#: ../app/helpers/discovered_hosts_helper.rb:60
+#: ../app/helpers/discovered_hosts_helper.rb:58
 msgid "New in the last 24 hours"
 msgstr ""
 
-#: ../app/helpers/discovered_hosts_helper.rb:64
+#: ../app/helpers/discovered_hosts_helper.rb:62
 msgid "Not reported in more than 7 days"
 msgstr ""
 
-#: ../app/helpers/discovered_hosts_helper.rb:68
+#: ../app/helpers/discovered_hosts_helper.rb:66
 msgid "Reported in the last 7 days"
 msgstr ""
 
-#: ../app/helpers/discovered_hosts_helper.rb:92
+#: ../app/helpers/discovered_hosts_helper.rb:90
 msgid "Provision"
 msgstr "Provisionera"
 
-#: ../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:173
 msgid "Discovered Hosts"
 msgstr "Hittade värdar"
 
@@ -441,66 +408,59 @@ msgstr ""
 msgid "Discovered hosts summary"
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:9
+#: ../app/models/discovery_rule.rb:10
 msgid "can't contain white spaces."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:11
+#: ../app/models/discovery_rule.rb:12
 msgid "must start with a letter or ERB."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:45
-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"
+#: ../app/models/discovery_rule.rb:15
+msgid "must be present."
+msgstr ""
+
+#: ../app/models/discovery_rule.rb:48
+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] ""
 
-#: ../app/models/discovery_rule.rb:51
+#: ../app/models/discovery_rule.rb:54
 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"
+msgid_plural "Host group locations %s must also be associated to the discovery rule"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/models/host/discovered.rb:37
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:42
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:56
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:49
-msgid ""
-"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:63
+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:89
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:133
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr ""
-
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:212
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:198
+#: ../app/models/host/discovered.rb:220
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:206
+#: ../app/models/host/discovered.rb:228
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:247
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -553,9 +513,7 @@ msgid "Hostname facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
-msgid ""
-"Automatically provision newly discovered hosts, according to the "
-"provisioning rules"
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
@@ -631,9 +589,7 @@ msgid "IPMI facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:32
-msgid ""
-"Automatically generate PXE configuration to pin a newly discovered host to "
-"discovery"
+msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:32
@@ -672,26 +628,40 @@ msgstr ""
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:37
+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
+msgid "Error on existing NIC"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:44
 msgid "The default location to place discovered hosts in"
 msgstr "Standardplatsen att placera värdar i"
 
-#: ../app/models/setting/discovered.rb:43
+#: ../app/models/setting/discovered.rb:44
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "The default organization to place discovered hosts in"
 msgstr "Standardorganisationen att placera hittade värdar i"
 
-#: ../app/models/setting/discovered.rb:51
+#: ../app/models/setting/discovered.rb:52
 msgid "Discovery organization"
 msgstr ""
 
-#: ../app/services/foreman_discovery/fact_parser.rb:9
-msgid ""
-"Unable to detect primary interface using MAC '%{mac}' specified by "
-"discovery_fact '%{fact}'"
+#: ../app/services/foreman_discovery/fact_parser.rb:4
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:6
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_parser.rb:12
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
@@ -710,25 +680,15 @@ msgstr ""
 msgid "Host"
 msgstr "Värd"
 
-#: ../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
+#: ../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 "Modell"
 
-#: ../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
+#: ../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 "CPUer"
 
-#: ../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
+#: ../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 "Minne"
 
@@ -748,16 +708,11 @@ msgstr "Markera alla valbara på denna sida"
 msgid "items selected. Uncheck to Clear"
 msgstr "poster markerade. Avmarkera för att rensa"
 
-#: ../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
+#: ../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 "Namn"
 
-#: ../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
+#: ../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 "IPadress"
 
@@ -769,13 +724,11 @@ msgstr ""
 msgid "Disks Size"
 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
 msgid "Location"
 msgstr "Lokation"
 
-#: ../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:20 ../app/views/discovered_hosts/_selected_hosts.html.erb:13
 msgid "Organization"
 msgstr "Organisation"
 
@@ -803,18 +756,8 @@ msgstr "Sänd"
 msgid "Provision %s"
 msgstr ""
 
-#: ../app/views/discovered_hosts/index.html.erb:2
-msgid "Reboot All"
-msgstr ""
-
-#: ../app/views/discovered_hosts/index.html.erb:3
-msgid "Auto Provision All"
-msgstr ""
-
 #: ../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"
+msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr "Detta kan dröja då alla värdar, fakta och rapporter också kommer bli förstörda"
 
 #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -829,34 +772,36 @@ msgstr "Välj organisation"
 msgid "Discovered host: %s"
 msgstr "Hittade värdar: %s"
 
-#: ../app/views/discovered_hosts/show.html.erb:34
+#: ../app/views/discovered_hosts/show.html.erb:37
 msgid "Interfaces"
 msgstr ""
 
-#: ../app/views/discovered_hosts/show.html.erb:41
+#: ../app/views/discovered_hosts/show.html.erb:44
 msgid "Type"
 msgstr ""
 
-#: ../app/views/discovered_hosts/show.html.erb:42
+#: ../app/views/discovered_hosts/show.html.erb:45
 msgid "Identifier"
 msgstr ""
 
-#: ../app/views/discovered_hosts/show.html.erb:43
+#: ../app/views/discovered_hosts/show.html.erb:46
 msgid "MAC address"
 msgstr ""
 
-#: ../app/views/discovered_hosts/show.html.erb:44
+#: ../app/views/discovered_hosts/show.html.erb:47
 msgid "IP address"
 msgstr ""
 
+#: ../app/views/discovered_hosts/show.html.erb:66
+msgid "Collapse All"
+msgstr ""
+
 #: ../app/views/discovered_hosts/welcome.html.erb:7
 msgid "No discovered hosts found in this context."
 msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:8
-msgid ""
-"This page shows discovered bare-metal or virtual nodes waiting to be "
-"provisioned."
+msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
@@ -871,23 +816,19 @@ msgstr ""
 msgid "<b>Foreman</b> Discovered hosts summary"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
+#: ../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 ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
+#: ../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}"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
 msgstr ""
 
@@ -936,37 +877,27 @@ msgid "Rule priority (lower integer means higher priority)"
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:2
-msgid ""
-"Specify target hostname template pattern in the same syntax as in "
-"Provisioning Templates (ERB)."
+msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:4
-msgid ""
-"Domain will be appended automatically. A hostname based on MAC address will "
-"be used when left blank."
+msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:5
-msgid ""
-"In addition to @host attribute function rand for random integers is "
-"available. Examples:"
+msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:8
-msgid ""
-"When creating hostname patterns, make sure the resulting host names are "
-"unique."
+msgid "When creating hostname patterns, make sure the resulting host names are unique."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:9
-msgid ""
-"Hostnames must not start with numbers. A good approach is to use unique "
-"information provided by facter (MAC address, BIOS or serial ID)."
+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 ""
 
 #: ../app/views/discovery_rules/edit.html.erb:1
-msgid "Edit Discovery Rule"
+msgid "Edit %s"
 msgstr ""
 
 #: ../app/views/discovery_rules/index.html.erb:1
@@ -1021,30 +952,26 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:151
+#: ../lib/foreman_discovery/engine.rb:158
 msgid "Discovered hosts"
 msgstr "Hittade värdar"
 
-#: ../lib/foreman_discovery/engine.rb:156
+#: ../lib/foreman_discovery/engine.rb:163
 msgid "Discovery rules"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:172
+#: ../lib/foreman_discovery/engine.rb:179
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:181
+#: ../lib/foreman_discovery/engine.rb:188
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:182
-msgid ""
-"Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:189
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:183
-msgid ""
-"ID of Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:190
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""