RubyGems - foreman_discovery - Versions diffs - 10.0.0 → 11.0.0 - Mend

foreman_discovery 10.0.0 → 11.0.0

Files changed (99) hide show

checksums.yaml +4 -4
data/README.md +1 -1
data/app/controllers/api/v2/discovered_hosts_controller.rb +1 -1
data/app/controllers/api/v2/discovery_rules_controller.rb +2 -1
data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb +9 -2
data/app/controllers/discovered_hosts_controller.rb +16 -15
data/app/controllers/discovery_rules_controller.rb +1 -1
data/app/models/host/discovered.rb +10 -4
data/app/models/host/managed_extensions.rb +4 -1
data/app/views/foreman_discovery/debian_kexec.erb +1 -1
data/db/migrate/20141107091416_create_discovery_rules.rb +1 -1
data/db/migrate/20141107091417_add_discovery_rule_to_host.rb +1 -1
data/db/migrate/20141126165451_add_discovery_id_to_subnet.rb +1 -1
data/db/migrate/20141223101707_create_discovery_attribute_sets.rb +1 -1
data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb +1 -1
data/db/migrate/20150302112545_remove_duplicate_tokens_from_hosts.rb +1 -1
data/db/migrate/20150310153859_remove_discovery_attribute_sets_from_managed_hosts.rb +1 -1
data/db/migrate/20150331132115_remove_old_permissions.rb +1 -1
data/db/migrate/20150505111345_remove_leftover_tokens.rb +1 -1
data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb +1 -1
data/db/migrate/20150714144500_review_discovery_permissions.rb +1 -1
data/db/migrate/20151023144501_regenerate_red_hat_kexec.rb +1 -1
data/db/migrate/20160719124942_add_missing_view_permissions.rb +1 -1
data/db/migrate/20160805104605_rename_lock_template_setting.rb +1 -1
data/db/migrate/20160818091421_add_permissions_from_default_roles.rb +1 -1
data/db/migrate/20160925213030_change_discovery_widget_names.rb +1 -1
data/db/migrate/20160927164411_define_explicit_length_for_discovery_rule_attributes.rb +1 -1
data/db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb +4 -1
data/lib/foreman_discovery/engine.rb +2 -1
data/lib/foreman_discovery/version.rb +1 -1
data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/ca/foreman_discovery.edit.po +47 -38
data/locale/ca/foreman_discovery.po +18 -11
data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/de/foreman_discovery.edit.po +50 -42
data/locale/de/foreman_discovery.po +21 -15
data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/en/foreman_discovery.edit.po +51 -43
data/locale/en/foreman_discovery.po +7 -1
data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/en_GB/foreman_discovery.edit.po +43 -35
data/locale/en_GB/foreman_discovery.po +14 -8
data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/es/foreman_discovery.edit.po +208 -200
data/locale/es/foreman_discovery.po +179 -173
data/locale/foreman_discovery.pot +52 -44
data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/fr/foreman_discovery.edit.po +54 -46
data/locale/fr/foreman_discovery.po +25 -19
data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/gl/foreman_discovery.edit.po +37 -29
data/locale/gl/foreman_discovery.po +8 -2
data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/it/foreman_discovery.edit.po +51 -43
data/locale/it/foreman_discovery.po +22 -16
data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/ja/foreman_discovery.edit.po +184 -176
data/locale/ja/foreman_discovery.po +155 -151
data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/ko/foreman_discovery.edit.po +57 -49
data/locale/ko/foreman_discovery.po +28 -22
data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/pt_BR/foreman_discovery.edit.po +206 -198
data/locale/pt_BR/foreman_discovery.po +177 -171
data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/ru/foreman_discovery.edit.po +57 -49
data/locale/ru/foreman_discovery.po +28 -22
data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/sv_SE/foreman_discovery.edit.po +37 -29
data/locale/sv_SE/foreman_discovery.po +8 -2
data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/zh_CN/foreman_discovery.edit.po +204 -196
data/locale/zh_CN/foreman_discovery.po +177 -169
data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
data/locale/zh_TW/foreman_discovery.edit.po +47 -39
data/locale/zh_TW/foreman_discovery.po +18 -12
data/test/factories/discovery_host_related.rb +2 -2
data/test/factories/discovery_rule_related.rb +1 -1
data/test/functional/api/v2/discovered_hosts_controller_test.rb +28 -27
data/test/functional/api/v2/discovery_rules_controller_test.rb +14 -14
data/test/functional/api/v2/fact_value_extensions_test.rb +5 -2
data/test/functional/discovered_hosts_controller_test.rb +47 -40
data/test/functional/discovery_rules_controller_test.rb +14 -14
data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb +2 -2
data/test/integration/discovered_hosts_test.rb +151 -0
data/test/test_helper_discovery.rb +53 -23
data/test/test_plugin_helper.rb +3 -7
data/test/unit/discovered_extensions_test.rb +40 -38
data/test/unit/discovered_mailer_test.rb +1 -1
data/test/unit/discovery_attribute_set_test.rb +4 -2
data/test/unit/discovery_rule_test.rb +2 -2
data/test/unit/discovery_taxonomy_extensions_test.rb +1 -1
data/test/unit/fact_parser_test.rb +1 -1
data/test/unit/host_discovered_test.rb +26 -23
data/test/unit/managed_extensions_test.rb +1 -1
data/test/unit/ui_notifications/destroy_host_test.rb +21 -17
data/test/unit/ui_notifications/new_host_test.rb +11 -11
metadata +8 -3
data/config/as_deprecation_whitelist.yaml +0 -0

data/locale/ru/LC_MESSAGES/foreman_discovery.mo CHANGED

Binary file

data/locale/ru/foreman_discovery.edit.po CHANGED

@@ -10,11 +10,11 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 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: 2018-01-05 19:26+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "отсортировать результаты"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
-msgstr "постранично"
+msgstr "постраничный вывод"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:18
@@ -65,7 +65,7 @@ msgstr "Подготовить обнаруженный узел"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
 msgid "not required if using a subnet with DHCP proxy"
-msgstr "не требуется, если используется подсеть с DHCP-прокси"
+msgstr "не требуется, если используется подсеть с DHCP прокси"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:56
 msgid "not required if it's a virtual machine"
@@ -74,7 +74,7 @@ msgstr "не требуется для виртуальных машин"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
 msgid ""
 "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
-msgstr "UUID для отслеживания состояния задач оркестрации: GET /api/orchestration/:UUID/tasks"
+msgstr "UUID для отслеживания состояния задач оркестрации, GET /api/orchestration/:UUID/tasks"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
 msgid ""
@@ -88,7 +88,7 @@ msgstr "Удалить обнаруженный узел"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:96
 msgid "Upload facts for a host, creating the host if required"
-msgstr "Загрузить факты узла и, если необходимо, создать узел"
+msgstr "Загрузить факты узла, требуемые для создания узла"
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
 msgid ""
@@ -102,7 +102,7 @@ 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/discovered_hosts_controller.rb:150
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "%{host} был подготовлен в соответствии с правилом %{rule}"
@@ -111,7 +111,7 @@ msgid "Unable to provision %{host}: %{errors}"
 msgstr "Не удалось подготовить %{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 "Нет правил для %s"
@@ -120,12 +120,12 @@ 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/discovered_hosts_controller.rb:163
 msgid "Errors during auto provisioning: %s"
 msgstr "Ошибки при автоматической подготовке: %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 "Нет обнаруженных узлов"
@@ -188,15 +188,23 @@ msgstr "приоритет правила (должен быть больше 0)
 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 "Удалить правило"
@@ -256,59 +264,59 @@ msgstr "Не удалось перезагрузить %{hostname}. Ошибка
 msgid "Failed to reboot hosts with error %s"
 msgstr "Не удалось перезагрузить узлы. Ошибка: %s"
-#: ../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 "Узлы не были удалены: %s"
-#: ../app/controllers/discovered_hosts_controller.rb:156
+#: ../app/controllers/discovered_hosts_controller.rb:154
 msgid "Failed to auto provision host %s: %s"
 msgstr "Не удалось автоматически подготовить узел %s: %s"
-#: ../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 "Хранилище"
+msgstr "Хранение данных"
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Hardware"
-msgstr "Оборудование"
+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 "Программное обеспечение"
+msgstr "Программы"
-#: ../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 "Прочее"
+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 "Непредвиденное поведение при выборе узлов: %s"
@@ -502,23 +510,23 @@ msgstr "Не удалось выполнить kexec на %{name} с %{url}: %{m
 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 "Перезагрузка ядра на %s"
-#: ../app/models/host/managed_extensions.rb:22
+#: ../app/models/host/managed_extensions.rb:25
 msgid "Rebooting %s"
 msgstr "Перезагрузка %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 не привязан к операционной системе"
-#: ../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 ""
@@ -721,7 +729,7 @@ msgstr "Модель"
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:20
 #: ../app/views/discovered_mailer/discovered_summary.text.erb:12
 msgid "CPUs"
-msgstr "CPU"
+msgstr "Процессоры"
 #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
@@ -833,7 +841,7 @@ msgstr "Интерфейсы"
 #: ../app/views/discovered_hosts/show.html.erb:41
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 #: ../app/views/discovered_hosts/show.html.erb:42
 msgid "Identifier"
@@ -841,11 +849,11 @@ msgstr "Идентификатор"
 #: ../app/views/discovered_hosts/show.html.erb:43
 msgid "MAC address"
-msgstr "MAC"
+msgstr "MAC-адрес"
 #: ../app/views/discovered_hosts/show.html.erb:44
 msgid "IP address"
-msgstr "IP"
+msgstr "IP-адрес"
 #: ../app/views/discovered_hosts/welcome.html.erb:7
 msgid "No discovered hosts found in this context."
@@ -882,12 +890,12 @@ msgstr "Узлы, обнаруженные сервером Foreman %{foreman_ur
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:22
 #: ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
-msgstr "Число дисков"
+msgstr "Количество дисков"
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:23
 #: ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
-msgstr "Размер дисков"
+msgstr "Размер диска"
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:31
 msgid "No discovered hosts for the selected period"
@@ -907,7 +915,7 @@ msgstr "Основной"
 #: ../app/views/discovery_rules/_form.html.erb:7
 msgid "Locations"
-msgstr "Местоположение"
+msgstr "Местоположения"
 #: ../app/views/discovery_rules/_form.html.erb:10
 msgid "Organizations"
@@ -923,7 +931,7 @@ msgstr "Имя узла"
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Hosts Limit"
-msgstr ""
+msgstr "Ограничение узлов"
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
@@ -989,7 +997,7 @@ msgstr "Запрос"
 #: ../app/views/discovery_rules/index.html.erb:9
 msgid "Host Group"
-msgstr ""
+msgstr "Группа узлов"
 #: ../app/views/discovery_rules/index.html.erb:10
 msgid "Hosts/Limit"
@@ -1009,7 +1017,7 @@ msgstr "Сводка состояния обнаруженных узлов"
 #: ../db/seeds.d/80_discovery_ui_notification.rb:4
 msgid "Hosts"
-msgstr ""
+msgstr "Узлы"
 #: ../db/seeds.d/80_discovery_ui_notification.rb:6
 msgid "One or more hosts have been discovered"
@@ -1017,7 +1025,7 @@ msgstr ""
 #: ../db/seeds.d/80_discovery_ui_notification.rb:13
 msgid "Details"
-msgstr ""
+msgstr "Свойства"
 #: ../lib/foreman_discovery/engine.rb:151
 msgid "Discovered hosts"

data/locale/ru/foreman_discovery.po CHANGED

@@ -10,10 +10,10 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 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"
-"PO-Revision-Date: 2017-10-17 23:23+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2018-01-05 19:26+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgid "Back"
 msgstr "Назад"
 msgid "CPUs"
-msgstr "CPU"
+msgstr "Процессоры"
 msgid "Cancel"
 msgstr "Отмена"
@@ -121,7 +121,7 @@ msgid "Destroyed selected hosts"
 msgstr "Узлы удалены"
 msgid "Details"
-msgstr ""
+msgstr "Свойства"
 msgid "Disable"
 msgstr "Отключить"
@@ -187,13 +187,13 @@ msgid "Disk Count"
 msgstr ""
 msgid "Disk count"
-msgstr "Число дисков"
+msgstr "Количество дисков"
 msgid "Disks Size"
 msgstr ""
 msgid "Disks size"
-msgstr "Размер дисков"
+msgstr "Размер диска"
 msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
@@ -268,7 +268,7 @@ msgid "Foreman discovered hosts summary"
 msgstr "Сводка обнаруженных узлов Foreman"
 msgid "Hardware"
-msgstr "Оборудование"
+msgstr "Физическое"
 msgid "Hardware facts"
 msgstr ""
@@ -286,7 +286,7 @@ msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "%{host} был подготовлен в соответствии с правилом %{rule}"
 msgid "Host Group"
-msgstr ""
+msgstr "Группа узлов"
 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"
@@ -318,10 +318,10 @@ msgid "Hostnames must not start with numbers. A good approach is to use unique i
 msgstr ""
 msgid "Hosts"
-msgstr ""
+msgstr "Узлы"
 msgid "Hosts Limit"
-msgstr ""
+msgstr "Ограничение узлов"
 msgid "Hosts/Limit"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "IP Address"
 msgstr "IP"
 msgid "IP address"
-msgstr "IP"
+msgstr "IP-адрес"
 msgid "IPMI"
 msgstr "IPMI"
@@ -399,7 +399,7 @@ msgid "Location"
 msgstr "Местоположение"
 msgid "Locations"
-msgstr "Местоположение"
+msgstr "Местоположения"
 msgid "Lock PXE"
 msgstr ""
@@ -414,7 +414,7 @@ msgid "Locked PXELinux template name"
 msgstr ""
 msgid "MAC address"
-msgstr "MAC"
+msgstr "MAC-адрес"
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
 msgstr "Максимальное число инициализируемых узлов в соответствии с правилом (0 снимает ограничения)"
@@ -423,7 +423,7 @@ msgid "Memory"
 msgstr "Память"
 msgid "Miscellaneous"
-msgstr "Прочее"
+msgstr "Дополнительно"
 msgid "Model"
 msgstr "Модель"
@@ -594,7 +594,7 @@ msgid "Show a discovery rule"
 msgstr "Показать правило"
 msgid "Software"
-msgstr "Программное обеспечение"
+msgstr "Программы"
 msgid "Software facts"
 msgstr ""
@@ -606,7 +606,7 @@ msgid "Specify target hostname template pattern in the same syntax as in Provisi
 msgstr "Определите шаблон для узла, используя синтаксис, аналогичный используемому в подготовительных шаблонах (ERB)."
 msgid "Storage"
-msgstr "Хранилище"
+msgstr "Хранение данных"
 msgid "Storage facts"
 msgstr ""
@@ -648,10 +648,10 @@ msgid "This page shows discovered bare-metal or virtual nodes waiting to be prov
 msgstr ""
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
-msgstr "UUID для отслеживания состояния задач оркестрации: 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-адрес основного интерфейса"
@@ -675,7 +675,7 @@ msgid "Update a rule"
 msgstr "Обновить правило"
 msgid "Upload facts for a host, creating the host if required"
-msgstr "Загрузить факты узла и, если необходимо, создать узел"
+msgstr "Загрузить факты узла, требуемые для создания узла"
 msgid "When creating hostname patterns, make sure the resulting host names are unique."
 msgstr ""
@@ -701,6 +701,9 @@ msgstr "хэш с минимальным набором фактов узла: d
 msgid "items selected. Uncheck to Clear"
 msgstr "выбрано. Чтобы очистить, снимите флажок"
+msgid "location ID for provisioned hosts"
+msgstr ""
 msgid "must start with a letter or ERB."
 msgstr "должен начинаться с буквы или ERB"
@@ -708,13 +711,16 @@ msgid "not required if it's a virtual machine"
 msgstr "не требуется для виртуальных машин"
 msgid "not required if using a subnet with DHCP proxy"
-msgstr "не требуется, если используется подсеть с DHCP-прокси"
+msgstr "не требуется, если используется подсеть с DHCP прокси"
 msgid "number of entries per request"
 msgstr "количество записей на запрос"
+msgid "organization ID for provisioned hosts"
+msgstr ""
 msgid "paginate results"
-msgstr "постранично"
+msgstr "постраничный вывод"
 msgid "puts the rules in order, low numbers go first. Must be greater then zero"
 msgstr "приоритет правила (должен быть больше 0). Правила выбираются по возрастанию приоритета"