foreman_discovery 14.0.1 → 15.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +8 -4
  3. data/app/controllers/api/v2/discovery_rules_controller.rb +2 -2
  4. data/app/controllers/concerns/foreman/controller/discovered_extensions.rb +2 -6
  5. data/app/controllers/discovered_hosts_controller.rb +4 -8
  6. data/app/helpers/discovered_hosts_helper.rb +3 -3
  7. data/app/helpers/discovery_rules_helper.rb +3 -3
  8. data/app/models/discovery_rule.rb +9 -13
  9. data/app/models/host/discovered.rb +6 -10
  10. data/app/models/host/managed_extensions.rb +6 -6
  11. data/app/models/setting/discovered.rb +2 -16
  12. data/app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb +4 -4
  13. data/app/views/api/v2/discovered_hosts/main.json.rabl +2 -7
  14. data/app/views/api/v2/discovery_rules/main.json.rabl +4 -8
  15. data/app/views/discovered_hosts/_discovered_hosts_list.html.erb +8 -17
  16. data/app/views/discovered_hosts/_selected_hosts.html.erb +2 -10
  17. data/app/views/discovered_hosts/multiple_destroy.html.erb +1 -1
  18. data/app/views/discovered_hosts/select_multiple_location.html.erb +1 -1
  19. data/app/views/discovered_hosts/select_multiple_organization.html.erb +1 -1
  20. data/app/views/foreman_discovery/debian_kexec.erb +1 -1
  21. data/app/views/foreman_discovery/redhat_kexec.erb +5 -2
  22. data/db/seeds.d/50_discovery_templates.rb +2 -2
  23. data/lib/foreman_discovery/engine.rb +3 -3
  24. data/lib/foreman_discovery/version.rb +1 -1
  25. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  26. data/locale/ca/foreman_discovery.edit.po +92 -98
  27. data/locale/ca/foreman_discovery.po +2 -8
  28. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  29. data/locale/de/foreman_discovery.edit.po +111 -116
  30. data/locale/de/foreman_discovery.po +21 -26
  31. data/locale/en/foreman_discovery.edit.po +92 -100
  32. data/locale/en/foreman_discovery.po +0 -6
  33. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  34. data/locale/en_GB/foreman_discovery.edit.po +92 -98
  35. data/locale/en_GB/foreman_discovery.po +2 -8
  36. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  37. data/locale/es/foreman_discovery.edit.po +106 -112
  38. data/locale/es/foreman_discovery.po +16 -22
  39. data/locale/foreman_discovery.pot +103 -109
  40. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  41. data/locale/fr/foreman_discovery.edit.po +107 -113
  42. data/locale/fr/foreman_discovery.po +17 -23
  43. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  44. data/locale/gl/foreman_discovery.edit.po +92 -98
  45. data/locale/gl/foreman_discovery.po +2 -8
  46. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  47. data/locale/it/foreman_discovery.edit.po +92 -98
  48. data/locale/it/foreman_discovery.po +2 -8
  49. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  50. data/locale/ja/foreman_discovery.edit.po +106 -112
  51. data/locale/ja/foreman_discovery.po +16 -22
  52. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  53. data/locale/ko/foreman_discovery.edit.po +92 -98
  54. data/locale/ko/foreman_discovery.po +2 -8
  55. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  56. data/locale/pt_BR/foreman_discovery.edit.po +106 -112
  57. data/locale/pt_BR/foreman_discovery.po +16 -22
  58. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  59. data/locale/ru/foreman_discovery.edit.po +92 -98
  60. data/locale/ru/foreman_discovery.po +2 -8
  61. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  62. data/locale/sv_SE/foreman_discovery.edit.po +92 -98
  63. data/locale/sv_SE/foreman_discovery.po +2 -8
  64. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  65. data/locale/zh_CN/foreman_discovery.edit.po +106 -112
  66. data/locale/zh_CN/foreman_discovery.po +16 -22
  67. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  68. data/locale/zh_TW/foreman_discovery.edit.po +92 -98
  69. data/locale/zh_TW/foreman_discovery.po +2 -8
  70. data/test/factories/discovery_rule_related.rb +2 -2
  71. data/test/facts/asswweb061.json +2967 -0
  72. data/test/facts/qemu_noip.json +2 -0
  73. data/test/functional/api/v2/discovered_hosts_controller_test.rb +0 -16
  74. data/test/functional/discovered_hosts_controller_test.rb +19 -21
  75. data/test/test_helper_discovery.rb +1 -1
  76. data/test/unit/discovery_rule_test.rb +0 -2
  77. data/test/unit/host_discovered_test.rb +72 -16
  78. data/test/unit/managed_extensions_test.rb +2 -2
  79. data/test/unit/ui_notifications/destroy_host_test.rb +9 -0
  80. metadata +7 -2
@@ -12,8 +12,8 @@ msgid ""
12
12
  msgstr ""
13
13
  "Project-Id-Version: foreman_discovery 14.0.0\n"
14
14
  "Report-Msgid-Bugs-To: \n"
15
- "PO-Revision-Date: 2018-10-25 20:13+0000\n"
16
- "Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n"
15
+ "PO-Revision-Date: 2019-04-18 19:36+0000\n"
16
+ "Last-Translator: Lukáš Zapletal\n"
17
17
  "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/l"
18
18
  "anguage/pt_BR/)\n"
19
19
  "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgid "Auto provisioning"
56
56
  msgstr "Provisionamento automático"
57
57
 
58
58
  msgid "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
59
- msgstr ""
59
+ msgstr "Interface de vínculo automático (se outra interface for detectada na mesma VLAN via LLDP)"
60
60
 
61
61
  msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
62
62
  msgstr "Gerar configuração PXE automaticamente para fixar um host novo descoberto para o Discovery"
@@ -86,7 +86,7 @@ msgid "Collapse All"
86
86
  msgstr "Recolher todos"
87
87
 
88
88
  msgid "Command line options for kexec during PXE-less provisioning."
89
- msgstr ""
89
+ msgstr "Opções da linha de comando para o kexec durante o provisionamento sem PXE."
90
90
 
91
91
  msgid "Could not get facts from proxy %{url}: %{error}"
92
92
  msgstr "Não foi possível obter fatos do proxy %{url}: %{error}"
@@ -104,7 +104,7 @@ msgid "Create a discovery rule"
104
104
  msgstr "Criar uma regra do Discovery"
105
105
 
106
106
  msgid "Create bond interfaces"
107
- msgstr ""
107
+ msgstr "Criar interfaces de vínculo"
108
108
 
109
109
  msgid "Customize Host"
110
110
  msgstr "Personalizar host"
@@ -143,14 +143,11 @@ msgid "Discovered Hosts"
143
143
  msgstr "Hosts descobertos"
144
144
 
145
145
  msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
146
- msgstr ""
146
+ msgstr "O host '%{host}' descoberto tem todas as NICs filtradas. Filtro: %{filter}"
147
147
 
148
148
  msgid "Discovered host: %s"
149
149
  msgstr "Host descoberto: %s"
150
150
 
151
- msgid "Discovered hosts"
152
- msgstr "Hosts descobertos"
153
-
154
151
  msgid "Discovered hosts are provisioning now"
155
152
  msgstr "Hosts descobertos estão sendo provisionados agora"
156
153
 
@@ -176,10 +173,10 @@ msgid "Discovery Rules"
176
173
  msgstr "Regras do Discovery"
177
174
 
178
175
  msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
179
- msgstr ""
176
+ msgstr "O analisador de fatos de descoberta não funciona com o host '%{host}' de não descoberta"
180
177
 
181
178
  msgid "Discovery hostname naming pattern"
182
- msgstr ""
179
+ msgstr "Padrão de nomenclatura de nome de host de descoberta"
183
180
 
184
181
  msgid "Discovery location"
185
182
  msgstr "Local do Discovery"
@@ -187,9 +184,6 @@ msgstr "Local do Discovery"
187
184
  msgid "Discovery organization"
188
185
  msgstr "Organização do Discovery"
189
186
 
190
- msgid "Discovery rules"
191
- msgstr "Regras do Discovery"
192
-
193
187
  msgid "DiscoveryRule|Enabled"
194
188
  msgstr "DiscoveryRule|Habilitado"
195
189
 
@@ -215,7 +209,7 @@ msgid "Disks size"
215
209
  msgstr "Tamanho do disco"
216
210
 
217
211
  msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
218
- msgstr ""
212
+ msgstr "Não permitir descobrir MAC correspondente de host gerenciado existente de uma NIC de provisionamento (apresenta erros cedo)"
219
213
 
220
214
  msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
221
215
  msgstr "O domínio será anexado automaticamente. Um nome de host baseado no endereço MAC será usado quando deixado em branco."
@@ -230,7 +224,7 @@ msgid "Enable rule '%s'?"
230
224
  msgstr "Habilitar regra '%s'?"
231
225
 
232
226
  msgid "Error on existing NIC"
233
- msgstr ""
227
+ msgstr "Erro na NIC existente"
234
228
 
235
229
  msgid "Errors during auto provisioning: %s"
236
230
  msgstr "Erros durante o provisionamento automático: %s"
@@ -251,7 +245,7 @@ msgid "Extra facter columns to show in host lists (separate by comma)"
251
245
  msgstr "Colunas extras do Facter para exibir nas listas de hosts (separadas por vírgulas)"
252
246
 
253
247
  msgid "Fact + prefix"
254
- msgstr ""
248
+ msgstr "Fato + prefixo"
255
249
 
256
250
  msgid "Fact columns"
257
251
  msgstr "Colunas de fatos"
@@ -393,7 +387,7 @@ msgid "Invalid hostname: Could not normalize the hostname"
393
387
  msgstr "Nome de host inválido: não foi possível normalizar o nome do host"
394
388
 
395
389
  msgid "Invalid user type of %s was provided"
396
- msgstr ""
390
+ msgstr "O tipo de usuário inválido %s foi fornecido"
397
391
 
398
392
  msgid "Kernel kexec URL is invalid: '%s'"
399
393
  msgstr "URL do kexec do kernel é inválido: '%s'"
@@ -441,7 +435,7 @@ msgid "MAC address"
441
435
  msgstr "Endereço MAC"
442
436
 
443
437
  msgid "MAC-based name"
444
- msgstr ""
438
+ msgstr "Nome baseado em MAC"
445
439
 
446
440
  msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
447
441
  msgstr "Máximo de hosts provisionados com essa regra (0 = ilimitado)"
@@ -540,7 +534,7 @@ msgid "Provision a discovered host"
540
534
  msgstr "Provisionar um host descoberto"
541
535
 
542
536
  msgid "Random name"
543
- msgstr ""
537
+ msgstr "Nome aleatório"
544
538
 
545
539
  msgid "Reboot"
546
540
  msgstr "Reiniciar"
@@ -684,7 +678,7 @@ msgid "Unable to find a discovery rule, no host provided (check permissions)"
684
678
  msgstr "Não foi possível encontrar uma regra do Discovery, nenhum host foi fornecido (verifique as permissões)"
685
679
 
686
680
  msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
687
- msgstr ""
681
+ msgstr "Não foi possível encontrar a NIC primária com o %{mac} especificado via '%{fact}'. Filtro da NIC: %{filter}"
688
682
 
689
683
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
690
684
  msgstr "Não foi possível executar kexec no %{name} por %{url}: %{msg}"
@@ -729,7 +723,7 @@ msgid "location ID for provisioned hosts"
729
723
  msgstr "ID de local para hosts provisionados"
730
724
 
731
725
  msgid "must be present."
732
- msgstr ""
726
+ msgstr "deve estar presente."
733
727
 
734
728
  msgid "must start with a letter or ERB."
735
729
  msgstr "deve iniciar com uma letra ou ERB."
@@ -12,9 +12,9 @@ msgid ""
12
12
  msgstr ""
13
13
  "Project-Id-Version: foreman_discovery 14.0.0\n"
14
14
  "Report-Msgid-Bugs-To: \n"
15
- "POT-Creation-Date: 2018-11-05 08:34+0100\n"
16
- "PO-Revision-Date: 2018-10-25 20:13+0000\n"
17
- "Last-Translator: Andrei Burd <burdandrei@gmail.com>\n"
15
+ "POT-Creation-Date: 2019-04-18 13:34+0200\n"
16
+ "PO-Revision-Date: 2019-04-18 19:36+0000\n"
17
+ "Last-Translator: Lukáš Zapletal\n"
18
18
  "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)\n"
19
19
  "MIME-Version: 1.0\n"
20
20
  "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,15 +216,15 @@ msgstr ""
216
216
  msgid "Unable to find a discovery rule, no host provided (check permissions)"
217
217
  msgstr "Не удалось найти правило: необходимо указать узел. Проверьте разрешения."
218
218
 
219
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:47
219
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:43
220
220
  msgid "No hostgroup associated with rule '%s'"
221
221
  msgstr "Правило «%s» не связано ни с одной группой узлов"
222
222
 
223
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
223
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:69
224
224
  msgid "Errors during reboot: %s"
225
225
  msgstr "Ошибки при перезагрузке: %s"
226
226
 
227
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
227
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:87
228
228
  msgid "No discovered hosts to reboot"
229
229
  msgstr "Нет узлов для перезагрузки"
230
230
 
@@ -334,19 +334,19 @@ msgstr "%s назад"
334
334
 
335
335
  #: ../app/helpers/discovered_hosts_helper.rb:14
336
336
  #: ../app/helpers/discovered_hosts_helper.rb:29
337
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
337
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
338
338
  msgid "Auto Provision"
339
339
  msgstr "Автоматическая подготовка"
340
340
 
341
341
  #: ../app/helpers/discovered_hosts_helper.rb:15
342
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
342
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
343
343
  msgid "Refresh facts"
344
344
  msgstr "Обновить факты"
345
345
 
346
346
  #: ../app/helpers/discovered_hosts_helper.rb:16
347
347
  #: ../app/helpers/discovered_hosts_helper.rb:30
348
- #: ../app/models/setting/discovered.rb:24
349
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
348
+ #: ../app/models/setting/discovered.rb:26
349
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
350
350
  msgid "Reboot"
351
351
  msgstr "Перезагрузить"
352
352
 
@@ -360,7 +360,7 @@ msgid "Select Action"
360
360
  msgstr "Действия"
361
361
 
362
362
  #: ../app/helpers/discovered_hosts_helper.rb:23
363
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
363
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
364
364
  msgid "Delete %s?"
365
365
  msgstr "Удалить %s?"
366
366
 
@@ -405,6 +405,7 @@ msgstr "Подготовить"
405
405
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
406
406
  #: ../app/views/discovered_hosts/welcome.html.erb:1
407
407
  #: ../app/views/discovered_hosts/welcome.html.erb:6
408
+ #: ../lib/foreman_discovery/engine.rb:158
408
409
  #: ../lib/foreman_discovery/engine.rb:173
409
410
  msgid "Discovered Hosts"
410
411
  msgstr "Обнаруженные узлы"
@@ -453,7 +454,7 @@ msgstr "должен начинаться с буквы или ERB"
453
454
  msgid "must be present."
454
455
  msgstr ""
455
456
 
456
- #: ../app/models/discovery_rule.rb:53
457
+ #: ../app/models/discovery_rule.rb:52
457
458
  msgid ""
458
459
  "Host group organization %s must also be associated to the discovery rule"
459
460
  msgid_plural ""
@@ -463,7 +464,7 @@ msgstr[1] "С правилом также необходимо связать о
463
464
  msgstr[2] "С правилом также необходимо связать организации группы узлов: %s"
464
465
  msgstr[3] "С правилом также необходимо связать организации группы узлов: %s"
465
466
 
466
- #: ../app/models/discovery_rule.rb:59
467
+ #: ../app/models/discovery_rule.rb:56
467
468
  msgid "Host group location %s must also be associated to the discovery rule"
468
469
  msgid_plural ""
469
470
  "Host group locations %s must also be associated to the discovery rule"
@@ -472,51 +473,51 @@ msgstr[1] "С правилом также необходимо связать м
472
473
  msgstr[2] "С правилом также необходимо связать местоположения групп узлов: %s"
473
474
  msgstr[3] "С правилом также необходимо связать местоположения групп узлов: %s"
474
475
 
475
- #: ../app/models/host/discovered.rb:45
476
+ #: ../app/models/host/discovered.rb:41
476
477
  msgid "Fact + prefix"
477
478
  msgstr ""
478
479
 
479
- #: ../app/models/host/discovered.rb:46
480
+ #: ../app/models/host/discovered.rb:42
480
481
  msgid "Random name"
481
482
  msgstr ""
482
483
 
483
- #: ../app/models/host/discovered.rb:47
484
+ #: ../app/models/host/discovered.rb:43
484
485
  msgid "MAC-based name"
485
486
  msgstr ""
486
487
 
487
- #: ../app/models/host/discovered.rb:56
488
+ #: ../app/models/host/discovered.rb:52
488
489
  msgid "Invalid facts, must be a Hash"
489
490
  msgstr "Недопустимый формат фактов: ожидаются переменные и их значения"
490
491
 
491
- #: ../app/models/host/discovered.rb:61
492
+ #: ../app/models/host/discovered.rb:57
492
493
  msgid ""
493
494
  "Expected discovery_fact '%s' is missing, unable to detect primary interface "
494
495
  "and set hostname"
495
496
  msgstr "Отсутствует факт «%s»: невозможно определить основной интерфейс и имя узла"
496
497
 
497
- #: ../app/models/host/discovered.rb:74
498
+ #: ../app/models/host/discovered.rb:70
498
499
  msgid ""
499
500
  "Invalid facts: hash does not contain a valid value for any of the facts in "
500
501
  "the discovery_hostname setting: %s"
501
502
  msgstr "Недействительные факты: строка не содержит ни одного действительного значения фактов в соответствии с заданным в discovery_hostname: %s"
502
503
 
503
- #: ../app/models/host/discovered.rb:100
504
+ #: ../app/models/host/discovered.rb:96
504
505
  msgid "Facts could not be imported"
505
506
  msgstr ""
506
507
 
507
- #: ../app/models/host/discovered.rb:155
508
+ #: ../app/models/host/discovered.rb:151
508
509
  msgid "Could not get facts from proxy %{url}: %{error}"
509
510
  msgstr "Не удалось получить факты с %{url}: %{error}"
510
511
 
511
- #: ../app/models/host/discovered.rb:163
512
+ #: ../app/models/host/discovered.rb:159
512
513
  msgid "Unable to reboot %{name} via %{url}: %{msg}"
513
514
  msgstr "Не удалось перезагрузить %{name} с %{url}: %{msg}"
514
515
 
515
- #: ../app/models/host/discovered.rb:171
516
+ #: ../app/models/host/discovered.rb:167
516
517
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
517
518
  msgstr "Не удалось выполнить kexec на %{name} с %{url}: %{msg}"
518
519
 
519
- #: ../app/models/host/discovered.rb:190
520
+ #: ../app/models/host/discovered.rb:186
520
521
  msgid "Invalid hostname: Could not normalize the hostname"
521
522
  msgstr "Не удалось нормализовать имя узла"
522
523
 
@@ -545,193 +546,193 @@ msgid "Rebuild DNS for %s"
545
546
  msgstr ""
546
547
 
547
548
  #: ../app/models/setting/discovered.rb:19
549
+ msgid "The default location to place discovered hosts in"
550
+ msgstr "Местоположение для обнаруженных узлов по умолчанию"
551
+
552
+ #: ../app/models/setting/discovered.rb:19
553
+ msgid "Discovery location"
554
+ msgstr ""
555
+
556
+ #: ../app/models/setting/discovered.rb:20
557
+ msgid "The default organization to place discovered hosts in"
558
+ msgstr "Организация для обнаруженных узлов по умолчанию"
559
+
560
+ #: ../app/models/setting/discovered.rb:20
561
+ msgid "Discovery organization"
562
+ msgstr ""
563
+
564
+ #: ../app/models/setting/discovered.rb:21
548
565
  msgid "Fact name to use for primary interface detection"
549
566
  msgstr "Имя факта, определяющего основной сетевой интерфейс и имя узла"
550
567
 
551
- #: ../app/models/setting/discovered.rb:19
568
+ #: ../app/models/setting/discovered.rb:21
552
569
  msgid "Interface fact"
553
570
  msgstr ""
554
571
 
555
- #: ../app/models/setting/discovered.rb:20
572
+ #: ../app/models/setting/discovered.rb:22
556
573
  msgid ""
557
574
  "Automatic bond interface (if another interface is detected on the same VLAN "
558
575
  "via LLDP)"
559
576
  msgstr ""
560
577
 
561
- #: ../app/models/setting/discovered.rb:20
578
+ #: ../app/models/setting/discovered.rb:22
562
579
  msgid "Create bond interfaces"
563
580
  msgstr ""
564
581
 
565
- #: ../app/models/setting/discovered.rb:21
582
+ #: ../app/models/setting/discovered.rb:23
566
583
  msgid "Clean all reported facts during provisioning (except discovery facts)"
567
584
  msgstr ""
568
585
 
569
- #: ../app/models/setting/discovered.rb:21
586
+ #: ../app/models/setting/discovered.rb:23
570
587
  msgid "Clean all facts"
571
588
  msgstr ""
572
589
 
573
- #: ../app/models/setting/discovered.rb:22
590
+ #: ../app/models/setting/discovered.rb:24
574
591
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
575
592
  msgstr "Список фактов для узла с указанным именем (через запятую, до первого совпадения)"
576
593
 
577
- #: ../app/models/setting/discovered.rb:22
594
+ #: ../app/models/setting/discovered.rb:24
578
595
  msgid "Hostname facts"
579
596
  msgstr ""
580
597
 
581
- #: ../app/models/setting/discovered.rb:23
598
+ #: ../app/models/setting/discovered.rb:25
582
599
  msgid ""
583
600
  "Automatically provision newly discovered hosts, according to the "
584
601
  "provisioning rules"
585
602
  msgstr "Автоматически подготовить обнаруженные узлы в соответствии с заранее определенными правилами"
586
603
 
587
- #: ../app/models/setting/discovered.rb:23
604
+ #: ../app/models/setting/discovered.rb:25
588
605
  msgid "Auto provisioning"
589
606
  msgstr ""
590
607
 
591
- #: ../app/models/setting/discovered.rb:24
608
+ #: ../app/models/setting/discovered.rb:26
592
609
  msgid "Automatically reboot or kexec discovered host during provisioning"
593
610
  msgstr ""
594
611
 
595
- #: ../app/models/setting/discovered.rb:25
612
+ #: ../app/models/setting/discovered.rb:27
596
613
  msgid "The default prefix to use for the host name, must start with a letter"
597
614
  msgstr "Префикс имени узла (должен начинаться с буквы)"
598
615
 
599
- #: ../app/models/setting/discovered.rb:25
616
+ #: ../app/models/setting/discovered.rb:27
600
617
  msgid "Hostname prefix"
601
618
  msgstr ""
602
619
 
603
- #: ../app/models/setting/discovered.rb:26
620
+ #: ../app/models/setting/discovered.rb:28
604
621
  msgid "Extra facter columns to show in host lists (separate by comma)"
605
622
  msgstr "Дополнительные столбцы Facter в списке узлов (через запятую)"
606
623
 
607
- #: ../app/models/setting/discovered.rb:26
624
+ #: ../app/models/setting/discovered.rb:28
608
625
  msgid "Fact columns"
609
626
  msgstr ""
610
627
 
611
- #: ../app/models/setting/discovered.rb:27
628
+ #: ../app/models/setting/discovered.rb:29
612
629
  msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
613
630
  msgstr "Регулярное выражение для организации фактов в списке «Основные», например: ^(abc|cde)$"
614
631
 
615
- #: ../app/models/setting/discovered.rb:27
632
+ #: ../app/models/setting/discovered.rb:29
616
633
  msgid "Highlighted facts"
617
634
  msgstr ""
618
635
 
619
- #: ../app/models/setting/discovered.rb:28
636
+ #: ../app/models/setting/discovered.rb:30
620
637
  msgid "Regex to organize facts for storage section"
621
638
  msgstr "Регулярное выражение для организации фактов в секции «Хранилище»"
622
639
 
623
- #: ../app/models/setting/discovered.rb:28
640
+ #: ../app/models/setting/discovered.rb:30
624
641
  msgid "Storage facts"
625
642
  msgstr ""
626
643
 
627
- #: ../app/models/setting/discovered.rb:29
644
+ #: ../app/models/setting/discovered.rb:31
628
645
  msgid "Regex to organize facts for software section"
629
646
  msgstr "Регулярное выражение для организации фактов в секции «Программное обеспечение»"
630
647
 
631
- #: ../app/models/setting/discovered.rb:29
648
+ #: ../app/models/setting/discovered.rb:31
632
649
  msgid "Software facts"
633
650
  msgstr ""
634
651
 
635
- #: ../app/models/setting/discovered.rb:30
652
+ #: ../app/models/setting/discovered.rb:32
636
653
  msgid "Regex to organize facts for hardware section"
637
654
  msgstr "Регулярное выражение для организации фактов в секции «Оборудование»"
638
655
 
639
- #: ../app/models/setting/discovered.rb:30
656
+ #: ../app/models/setting/discovered.rb:32
640
657
  msgid "Hardware facts"
641
658
  msgstr ""
642
659
 
643
- #: ../app/models/setting/discovered.rb:31
660
+ #: ../app/models/setting/discovered.rb:33
644
661
  msgid "Regex to organize facts for network section"
645
662
  msgstr "Регулярное выражение для организации фактов в секции «Сеть»"
646
663
 
647
- #: ../app/models/setting/discovered.rb:31
664
+ #: ../app/models/setting/discovered.rb:33
648
665
  msgid "Network facts"
649
666
  msgstr ""
650
667
 
651
- #: ../app/models/setting/discovered.rb:32
668
+ #: ../app/models/setting/discovered.rb:34
652
669
  msgid "Regex to organize facts for ipmi section"
653
670
  msgstr "Регулярное выражение для организации фактов в секции «IPMI»"
654
671
 
655
- #: ../app/models/setting/discovered.rb:32
672
+ #: ../app/models/setting/discovered.rb:34
656
673
  msgid "IPMI facts"
657
674
  msgstr ""
658
675
 
659
- #: ../app/models/setting/discovered.rb:33
676
+ #: ../app/models/setting/discovered.rb:35
660
677
  msgid ""
661
678
  "Automatically generate PXE configuration to pin a newly discovered host to "
662
679
  "discovery"
663
680
  msgstr ""
664
681
 
665
- #: ../app/models/setting/discovered.rb:33
682
+ #: ../app/models/setting/discovered.rb:35
666
683
  msgid "Lock PXE"
667
684
  msgstr ""
668
685
 
669
- #: ../app/models/setting/discovered.rb:34
686
+ #: ../app/models/setting/discovered.rb:36
670
687
  msgid "PXELinux template to be used when pinning a host to discovery"
671
688
  msgstr ""
672
689
 
673
- #: ../app/models/setting/discovered.rb:34
690
+ #: ../app/models/setting/discovered.rb:36
674
691
  msgid "Locked PXELinux template name"
675
692
  msgstr ""
676
693
 
677
- #: ../app/models/setting/discovered.rb:35
694
+ #: ../app/models/setting/discovered.rb:37
678
695
  msgid "PXEGrub template to be used when pinning a host to discovery"
679
696
  msgstr ""
680
697
 
681
- #: ../app/models/setting/discovered.rb:35
698
+ #: ../app/models/setting/discovered.rb:37
682
699
  msgid "Locked PXEGrub template name"
683
700
  msgstr ""
684
701
 
685
- #: ../app/models/setting/discovered.rb:36
702
+ #: ../app/models/setting/discovered.rb:38
686
703
  msgid "PXEGrub2 template to be used when pinning a host to discovery"
687
704
  msgstr ""
688
705
 
689
- #: ../app/models/setting/discovered.rb:36
706
+ #: ../app/models/setting/discovered.rb:38
690
707
  msgid "Locked PXEGrub2 template name"
691
708
  msgstr ""
692
709
 
693
- #: ../app/models/setting/discovered.rb:37
710
+ #: ../app/models/setting/discovered.rb:39
694
711
  msgid "Force DNS entries creation when provisioning discovered host"
695
712
  msgstr ""
696
713
 
697
- #: ../app/models/setting/discovered.rb:37
714
+ #: ../app/models/setting/discovered.rb:39
698
715
  msgid "Force DNS"
699
716
  msgstr ""
700
717
 
701
- #: ../app/models/setting/discovered.rb:38
718
+ #: ../app/models/setting/discovered.rb:40
702
719
  msgid ""
703
720
  "Do not allow to discover existing managed host matching MAC of a "
704
721
  "provisioning NIC (errors out early)"
705
722
  msgstr ""
706
723
 
707
- #: ../app/models/setting/discovered.rb:38
724
+ #: ../app/models/setting/discovered.rb:40
708
725
  msgid "Error on existing NIC"
709
726
  msgstr ""
710
727
 
711
- #: ../app/models/setting/discovered.rb:39
728
+ #: ../app/models/setting/discovered.rb:41
712
729
  msgid "Discovery hostname naming pattern"
713
730
  msgstr ""
714
731
 
715
- #: ../app/models/setting/discovered.rb:39
732
+ #: ../app/models/setting/discovered.rb:41
716
733
  msgid "Type of name generator"
717
734
  msgstr ""
718
735
 
719
- #: ../app/models/setting/discovered.rb:46
720
- msgid "The default location to place discovered hosts in"
721
- msgstr "Местоположение для обнаруженных узлов по умолчанию"
722
-
723
- #: ../app/models/setting/discovered.rb:46
724
- msgid "Discovery location"
725
- msgstr ""
726
-
727
- #: ../app/models/setting/discovered.rb:54
728
- msgid "The default organization to place discovered hosts in"
729
- msgstr "Организация для обнаруженных узлов по умолчанию"
730
-
731
- #: ../app/models/setting/discovered.rb:54
732
- msgid "Discovery organization"
733
- msgstr ""
734
-
735
736
  #: ../app/services/foreman_discovery/fact_parser.rb:4
736
737
  msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
737
738
  msgstr ""
@@ -821,38 +822,38 @@ msgstr ""
821
822
  msgid "Disks Size"
822
823
  msgstr ""
823
824
 
824
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
825
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
825
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16
826
+ #: ../app/views/discovered_hosts/_selected_hosts.html.erb:9
826
827
  msgid "Location"
827
828
  msgstr "Местоположение"
828
829
 
829
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
830
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
830
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
831
+ #: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
831
832
  msgid "Organization"
832
833
  msgstr "Организация"
833
834
 
834
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:22
835
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
835
836
  msgid "Subnet"
836
837
  msgstr "Подсеть"
837
838
 
838
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:23
839
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
839
840
  msgid "Last Facts Upload"
840
841
  msgstr ""
841
842
 
842
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:24
843
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
843
844
  #: ../app/views/discovery_rules/index.html.erb:12
844
845
  msgid "Actions"
845
846
  msgstr "Действия"
846
847
 
847
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:60
848
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:52
848
849
  msgid "Please Confirm"
849
850
  msgstr "Подтвердите"
850
851
 
851
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:66
852
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
852
853
  msgid "Cancel"
853
854
  msgstr "Отмена"
854
855
 
855
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:67
856
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:59
856
857
  msgid "Submit"
857
858
  msgstr "Подтвердить"
858
859
 
@@ -1023,6 +1024,7 @@ msgid "Edit %s"
1023
1024
  msgstr "Изменить %s"
1024
1025
 
1025
1026
  #: ../app/views/discovery_rules/index.html.erb:1
1027
+ #: ../lib/foreman_discovery/engine.rb:163
1026
1028
  msgid "Discovery Rules"
1027
1029
  msgstr "Правила обнаружения"
1028
1030
 
@@ -1078,14 +1080,6 @@ msgstr ""
1078
1080
  msgid "Details"
1079
1081
  msgstr "Свойства"
1080
1082
 
1081
- #: ../lib/foreman_discovery/engine.rb:158
1082
- msgid "Discovered hosts"
1083
- msgstr "Обнаруженные узлы"
1084
-
1085
- #: ../lib/foreman_discovery/engine.rb:163
1086
- msgid "Discovery rules"
1087
- msgstr "Правила обнаружения"
1088
-
1089
1083
  #: ../lib/foreman_discovery/engine.rb:179
1090
1084
  msgid "Discovery Kexec template"
1091
1085
  msgstr ""