foreman_discovery 16.0.0 → 16.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (86) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +24 -11
  3. data/app/controllers/api/v2/discovery_rules_controller.rb +1 -1
  4. data/app/controllers/discovered_hosts_controller.rb +5 -3
  5. data/app/controllers/discovery_rules_controller.rb +1 -1
  6. data/app/models/discovery_rule.rb +1 -1
  7. data/app/models/host/discovered.rb +52 -34
  8. data/app/models/host/managed_extensions.rb +2 -2
  9. data/app/models/setting/discovered.rb +3 -1
  10. data/app/services/foreman_discovery/host_converter.rb +15 -7
  11. data/app/services/foreman_discovery/host_fact_importer.rb +10 -0
  12. data/app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb +2 -0
  13. data/app/services/foreman_discovery/node_api/node_resource.rb +1 -0
  14. data/app/views/api/v2/discovery_rules/create.json.rabl +3 -0
  15. data/app/views/discovered_hosts/_discovered_host_modal.html.erb +0 -2
  16. data/app/views/discovered_hosts/welcome.html.erb +15 -9
  17. data/app/views/discovery_rules/index.html.erb +1 -1
  18. data/app/views/foreman_discovery/debian_kexec.erb +3 -2
  19. data/app/views/foreman_discovery/redhat_kexec.erb +2 -1
  20. data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb +1 -1
  21. data/db/migrate/20151023144501_regenerate_red_hat_kexec.rb +1 -1
  22. data/db/migrate/20180412124505_add_priority_score_to_discovery_rules.rb +1 -1
  23. data/extra/discover-host +14 -8
  24. data/lib/foreman_discovery/engine.rb +5 -4
  25. data/lib/foreman_discovery/version.rb +1 -1
  26. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  27. data/locale/ca/foreman_discovery.edit.po +195 -252
  28. data/locale/ca/foreman_discovery.po +40 -17
  29. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  30. data/locale/de/foreman_discovery.edit.po +201 -257
  31. data/locale/de/foreman_discovery.po +46 -23
  32. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  33. data/locale/en/foreman_discovery.edit.po +141 -111
  34. data/locale/en/foreman_discovery.po +36 -13
  35. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  36. data/locale/en_GB/foreman_discovery.edit.po +205 -254
  37. data/locale/en_GB/foreman_discovery.po +42 -19
  38. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  39. data/locale/es/foreman_discovery.edit.po +209 -258
  40. data/locale/es/foreman_discovery.po +46 -23
  41. data/locale/foreman_discovery.pot +150 -117
  42. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  43. data/locale/fr/foreman_discovery.edit.po +203 -255
  44. data/locale/fr/foreman_discovery.po +44 -21
  45. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  46. data/locale/gl/foreman_discovery.edit.po +190 -250
  47. data/locale/gl/foreman_discovery.po +38 -15
  48. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  49. data/locale/it/foreman_discovery.edit.po +193 -253
  50. data/locale/it/foreman_discovery.po +41 -18
  51. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  52. data/locale/ja/foreman_discovery.edit.po +207 -256
  53. data/locale/ja/foreman_discovery.po +44 -21
  54. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  55. data/locale/ko/foreman_discovery.edit.po +196 -255
  56. data/locale/ko/foreman_discovery.po +44 -21
  57. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  58. data/locale/pt_BR/foreman_discovery.edit.po +205 -256
  59. data/locale/pt_BR/foreman_discovery.po +44 -21
  60. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  61. data/locale/ru/foreman_discovery.edit.po +199 -257
  62. data/locale/ru/foreman_discovery.po +44 -21
  63. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  64. data/locale/sv_SE/foreman_discovery.edit.po +190 -250
  65. data/locale/sv_SE/foreman_discovery.po +38 -15
  66. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  67. data/locale/zh_CN/foreman_discovery.edit.po +207 -256
  68. data/locale/zh_CN/foreman_discovery.po +44 -21
  69. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  70. data/locale/zh_TW/foreman_discovery.edit.po +196 -254
  71. data/locale/zh_TW/foreman_discovery.po +42 -19
  72. data/package.json +39 -0
  73. data/test/facts/only-ipv6.json +205 -0
  74. data/test/facts/skylake-ipv6.json +223 -0
  75. data/test/functional/api/v2/settings_controller_test.rb +2 -2
  76. data/test/functional/discovered_hosts_controller_test.rb +16 -7
  77. data/test/functional/discovery_rules_controller_test.rb +1 -1
  78. data/test/unit/discovered_extensions_test.rb +6 -1
  79. data/test/unit/host_discovered_test.rb +0 -16
  80. data/test/unit/managed_extensions_test.rb +1 -0
  81. data/webpack/index.js +18 -0
  82. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js +28 -0
  83. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js +1 -0
  84. data/webpack/src/ForemanDiscovery/DiscoveredHosts/index.js +6 -0
  85. data/webpack/src/reducers.js +7 -0
  86. metadata +42 -28
@@ -8,10 +8,10 @@
8
8
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_discovery 15.1.0\n"
11
+ "Project-Id-Version: foreman_discovery 16.2.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
- "PO-Revision-Date: 2019-10-22 20:43+0000\n"
14
- "Last-Translator: Lukáš Zapletal\n"
13
+ "PO-Revision-Date: 2020-05-26 17:21+0000\n"
14
+ "Last-Translator: Transifex Bot <>\n"
15
15
  "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
16
16
  "uage/sv_SE/)\n"
17
17
  "MIME-Version: 1.0\n"
@@ -140,6 +140,11 @@ msgstr ""
140
140
  msgid "Disable rule '%s'?"
141
141
  msgstr ""
142
142
 
143
+ msgid "Discovered Host"
144
+ msgid_plural "Discovered Hosts"
145
+ msgstr[0] ""
146
+ msgstr[1] ""
147
+
143
148
  msgid "Discovered Hosts"
144
149
  msgstr "Hittade värdar"
145
150
 
@@ -321,6 +326,12 @@ msgstr[1] ""
321
326
  msgid "Host of type %s can not be rebooted"
322
327
  msgstr ""
323
328
 
329
+ msgid "Host's owner type"
330
+ msgstr ""
331
+
332
+ msgid "Host's parameters (array or indexed hash)"
333
+ msgstr ""
334
+
324
335
  msgid "Hostname facts"
325
336
  msgstr ""
326
337
 
@@ -408,9 +419,6 @@ msgstr ""
408
419
  msgid "Last Facts Upload"
409
420
  msgstr ""
410
421
 
411
- msgid "Learn more about this in the documentation."
412
- msgstr ""
413
-
414
422
  msgid "List all discovered hosts"
415
423
  msgstr ""
416
424
 
@@ -465,6 +473,9 @@ msgstr "N/A"
465
473
  msgid "Name"
466
474
  msgstr "Namn"
467
475
 
476
+ msgid "Name of the parameter"
477
+ msgstr ""
478
+
468
479
  msgid "Network"
469
480
  msgstr ""
470
481
 
@@ -483,9 +494,6 @@ msgstr ""
483
494
  msgid "No discovered hosts for the selected period"
484
495
  msgstr ""
485
496
 
486
- msgid "No discovered hosts found in this context."
487
- msgstr ""
488
-
489
497
  msgid "No discovered hosts to provision"
490
498
  msgstr ""
491
499
 
@@ -528,6 +536,9 @@ msgstr ""
528
536
  msgid "PXELinux template to be used when pinning a host to discovery"
529
537
  msgstr ""
530
538
 
539
+ msgid "Parameter value"
540
+ msgstr ""
541
+
531
542
  msgid "Please Confirm"
532
543
  msgstr "Var god, bekräfta"
533
544
 
@@ -675,15 +686,15 @@ msgstr "Följande värdar raderades inte: %s"
675
686
  msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
676
687
  msgstr "Detta kan dröja då alla värdar, fakta och rapporter också kommer bli förstörda"
677
688
 
678
- msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
679
- msgstr ""
680
-
681
689
  msgid "Type"
682
690
  msgstr ""
683
691
 
684
692
  msgid "Type of name generator"
685
693
  msgstr ""
686
694
 
695
+ msgid "Type of value"
696
+ msgstr ""
697
+
687
698
  msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
688
699
  msgstr ""
689
700
 
@@ -693,13 +704,16 @@ msgstr ""
693
704
  msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
694
705
  msgstr ""
695
706
 
696
- msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
707
+ msgid "Unable to perform %{action} on %{ips}"
697
708
  msgstr ""
698
709
 
699
- msgid "Unable to provision %{host}: %{errors}"
710
+ msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
711
+ msgstr ""
712
+
713
+ msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
700
714
  msgstr ""
701
715
 
702
- msgid "Unable to reboot %{name} via %{url}: %{msg}"
716
+ msgid "Unable to provision %{host}: %{errors}"
703
717
  msgstr ""
704
718
 
705
719
  msgid "Update a rule"
@@ -765,6 +779,15 @@ msgstr ""
765
779
  msgid "represents rule name shown to the users"
766
780
  msgstr ""
767
781
 
782
+ msgid "required if host is managed and custom partition has not been defined"
783
+ msgstr ""
784
+
785
+ msgid "required if host is managed and value is not inherited from host group"
786
+ msgstr ""
787
+
788
+ msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
789
+ msgstr ""
790
+
768
791
  msgid "required if value is not inherited from host group or default password in settings"
769
792
  msgstr ""
770
793
 
@@ -1,16 +1,16 @@
1
1
  # SOME DESCRIPTIVE TITLE.
2
2
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
3
  # This file is distributed under the same license as the foreman_discovery package.
4
- #
4
+ #
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_discovery 15.1.0\n"
8
+ "Project-Id-Version: foreman_discovery 16.2.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2019-10-22 11:55+0200\n"
11
- "PO-Revision-Date: 2019-10-22 20:43+0000\n"
12
- "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
13
- "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
10
+ "PO-Revision-Date: 2020-05-26 17:21+0000\n"
11
+ "Last-Translator: Transifex Bot <>\n"
12
+ "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
13
+ "age/zh_CN/)\n"
14
14
  "MIME-Version: 1.0\n"
15
15
  "Content-Type: text/plain; charset=UTF-8\n"
16
16
  "Content-Transfer-Encoding: 8bit\n"
@@ -21,23 +21,19 @@ msgstr ""
21
21
  msgid "List all discovered hosts"
22
22
  msgstr "列出所有发现主机"
23
23
 
24
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
25
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:15
24
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
26
25
  msgid "filter results"
27
26
  msgstr "过滤结果"
28
27
 
29
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
30
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:16
28
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
31
29
  msgid "sort results"
32
30
  msgstr "结果排序"
33
31
 
34
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
35
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:17
32
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
36
33
  msgid "paginate results"
37
34
  msgstr "编页结果"
38
35
 
39
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
40
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:18
36
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
41
37
  msgid "number of entries per request"
42
38
  msgstr "每个请求中的条目数"
43
39
 
@@ -45,8 +41,7 @@ msgstr "每个请求中的条目数"
45
41
  msgid "Show a discovered host"
46
42
  msgstr "显示一个发现主机"
47
43
 
48
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
49
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
44
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:85
50
45
  msgid "DHCP filename option (Grub2 or PXELinux by default)"
51
46
  msgstr "DHCP 文件名选项(默认为 Grub2 或 PXELinux)"
52
47
 
@@ -58,6 +53,10 @@ msgstr "创建一个用于测试的发现主机(使用 /详情创建新主机
58
53
  msgid "Provision a discovered host"
59
54
  msgstr "置备发现主机"
60
55
 
56
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:54 ../app/controllers/api/v2/discovered_hosts_controller.rb:57 ../app/controllers/api/v2/discovered_hosts_controller.rb:58 ../app/controllers/api/v2/discovered_hosts_controller.rb:61 ../app/controllers/api/v2/discovered_hosts_controller.rb:64
57
+ msgid "required if host is managed and value is not inherited from host group"
58
+ msgstr ""
59
+
61
60
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
62
61
  msgid "not required if using a subnet with DHCP proxy"
63
62
  msgstr "如果使用附带 DHCP 代理服务器的子网则不需要"
@@ -66,82 +65,99 @@ msgstr "如果使用附带 DHCP 代理服务器的子网则不需要"
66
65
  msgid "not required if it's a virtual machine"
67
66
  msgstr "如果是虚拟机,则不需要"
68
67
 
69
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
70
- msgid ""
71
- "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
68
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
69
+ msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
70
+ msgstr ""
71
+
72
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
73
+ msgid "required if host is managed and custom partition has not been defined"
74
+ msgstr ""
75
+
76
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
77
+ msgid "Host's owner type"
78
+ msgstr ""
79
+
80
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
81
+ msgid "Host's parameters (array or indexed hash)"
82
+ msgstr ""
83
+
84
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
85
+ msgid "Name of the parameter"
86
+ msgstr ""
87
+
88
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
89
+ msgid "Parameter value"
90
+ msgstr ""
91
+
92
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
93
+ msgid "Type of value"
94
+ msgstr ""
95
+
96
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
97
+ msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
72
98
  msgstr "用来跟踪业务流程任务状态的 UUID,GET /api/orchestration/:UUID/tasks"
73
99
 
74
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
75
- msgid ""
76
- "required if value is not inherited from host group or default password in "
77
- "settings"
100
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
101
+ msgid "required if value is not inherited from host group or default password in settings"
78
102
  msgstr "如果数值不是从主机组或设置中的默认密码继承,则需要。"
79
103
 
80
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
104
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:95
81
105
  msgid "Delete a discovered host"
82
106
  msgstr "删除发现主机"
83
107
 
84
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:96
108
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
85
109
  msgid "Upload facts for a host, creating the host if required"
86
110
  msgstr "上传主机的系统详情,如需要,请创建主机。"
87
111
 
88
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
89
- msgid ""
90
- "hash containing facts for the host with minimum set of facts: "
91
- "discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
92
- "eth0 (example in case primary interface is named eth0)"
112
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
113
+ 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)"
93
114
  msgstr "hash 包含具备最小详情集合的主机的详情:discovery_bootif、macaddress_eth0、ipaddress、ipaddress_eth0、interfaces: eth0(主接口名为 eth0 的示例)"
94
115
 
95
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
116
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:129
96
117
  msgid "Execute rules against a discovered host"
97
118
  msgstr "对发现主机执行规则"
98
119
 
99
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
100
- #: ../app/controllers/discovered_hosts_controller.rb:160
120
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:135 ../app/controllers/discovered_hosts_controller.rb:160
101
121
  msgid "Host %{host} was provisioned with rule %{rule}"
102
122
  msgstr "主机 %{host} 置备了规则 %{rule}"
103
123
 
104
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
124
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
105
125
  msgid "Unable to provision %{host}: %{errors}"
106
126
  msgstr "无法置备 %{host}:%{errors}"
107
127
 
108
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
109
- #: ../app/controllers/discovered_hosts_controller.rb:167
128
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:144 ../app/controllers/discovered_hosts_controller.rb:167
110
129
  msgid "No rule found for host %s"
111
130
  msgstr "没有为主机 %s 找到规则"
112
131
 
113
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
132
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:151
114
133
  msgid "Execute rules against all currently discovered hosts"
115
134
  msgstr "对当前所有发现主机执行规则"
116
135
 
117
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:142
118
- #: ../app/controllers/discovered_hosts_controller.rb:173
136
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:155 ../app/controllers/discovered_hosts_controller.rb:173
119
137
  msgid "Errors during auto provisioning: %s"
120
138
  msgstr "自动置备期间出错:%s"
121
139
 
122
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
123
- #: ../app/controllers/discovered_hosts_controller.rb:176
140
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:158 ../app/controllers/discovered_hosts_controller.rb:176
124
141
  msgid "No discovered hosts to provision"
125
142
  msgstr "没有要置备的发现主机"
126
143
 
127
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
144
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
128
145
  msgid "%s discovered hosts were provisioned"
129
146
  msgstr "已置备 %s 发现主机"
130
147
 
131
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
148
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
132
149
  msgid "Refreshing the facts of a discovered host"
133
150
  msgstr "刷新发现主机的详情"
134
151
 
135
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
152
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
136
153
  msgid "Rebooting a discovered host"
137
154
  msgstr "重启发现主机"
138
155
 
139
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
156
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:209
140
157
  msgid "Rebooting all discovered hosts"
141
158
  msgstr "重启所有发现主机"
142
159
 
143
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:207
144
- #: ../app/controllers/discovered_hosts_controller.rb:129
160
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:220 ../app/controllers/discovered_hosts_controller.rb:129
145
161
  msgid "Discovered hosts are rebooting now"
146
162
  msgstr "现在正在重启发现主机"
147
163
 
@@ -166,8 +182,7 @@ msgid "the hostgroup that is used to auto provision a host"
166
182
  msgstr "用于自动置备主机的主机组"
167
183
 
168
184
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
169
- msgid ""
170
- "defines a pattern to assign human-readable hostnames to the matching hosts"
185
+ msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
171
186
  msgstr "定义向匹配主机分配人类可读的主机名称的模式"
172
187
 
173
188
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -175,8 +190,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
175
190
  msgstr "支持根据规则限制置备主机的最大数量"
176
191
 
177
192
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
178
- msgid ""
179
- "puts the rules in order, low numbers go first. Must be greater then zero"
193
+ msgid "puts the rules in order, low numbers go first. Must be greater then zero"
180
194
  msgstr "按顺序排列规则,低数值优先。必须大于 0"
181
195
 
182
196
  #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -275,43 +289,43 @@ msgstr "无法自动置备主机 %s:%s"
275
289
  msgid "Discovered hosts are provisioning now"
276
290
  msgstr "现在发现主机正在置备"
277
291
 
278
- #: ../app/controllers/discovered_hosts_controller.rb:224
292
+ #: ../app/controllers/discovered_hosts_controller.rb:226
279
293
  msgid "Highlights"
280
294
  msgstr "亮点"
281
295
 
282
- #: ../app/controllers/discovered_hosts_controller.rb:224
296
+ #: ../app/controllers/discovered_hosts_controller.rb:226
283
297
  msgid "Storage"
284
298
  msgstr "存储"
285
299
 
286
- #: ../app/controllers/discovered_hosts_controller.rb:224
300
+ #: ../app/controllers/discovered_hosts_controller.rb:226
287
301
  msgid "Hardware"
288
302
  msgstr "硬件"
289
303
 
290
- #: ../app/controllers/discovered_hosts_controller.rb:224
304
+ #: ../app/controllers/discovered_hosts_controller.rb:226
291
305
  msgid "Network"
292
306
  msgstr "网络"
293
307
 
294
- #: ../app/controllers/discovered_hosts_controller.rb:224
308
+ #: ../app/controllers/discovered_hosts_controller.rb:226
295
309
  msgid "Software"
296
310
  msgstr "软件"
297
311
 
298
- #: ../app/controllers/discovered_hosts_controller.rb:224
312
+ #: ../app/controllers/discovered_hosts_controller.rb:226
299
313
  msgid "IPMI"
300
314
  msgstr "IPMI"
301
315
 
302
- #: ../app/controllers/discovered_hosts_controller.rb:224
316
+ #: ../app/controllers/discovered_hosts_controller.rb:226
303
317
  msgid "Miscellaneous"
304
318
  msgstr "杂项"
305
319
 
306
- #: ../app/controllers/discovered_hosts_controller.rb:302
320
+ #: ../app/controllers/discovered_hosts_controller.rb:304
307
321
  msgid "No hosts were found with that id or name"
308
322
  msgstr "未找到符合此 id 或者名称的主机"
309
323
 
310
- #: ../app/controllers/discovered_hosts_controller.rb:306
324
+ #: ../app/controllers/discovered_hosts_controller.rb:308
311
325
  msgid "No hosts selected"
312
326
  msgstr "未选择任何主机"
313
327
 
314
- #: ../app/controllers/discovered_hosts_controller.rb:312
328
+ #: ../app/controllers/discovered_hosts_controller.rb:314
315
329
  msgid "Something went wrong while selecting hosts - %s"
316
330
  msgstr "选择主机时出错 - %s"
317
331
 
@@ -327,21 +341,15 @@ msgstr "已禁用规则"
327
341
  msgid "%s ago"
328
342
  msgstr "%s 前"
329
343
 
330
- #: ../app/helpers/discovered_hosts_helper.rb:14
331
- #: ../app/helpers/discovered_hosts_helper.rb:29
332
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
344
+ #: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
333
345
  msgid "Auto Provision"
334
346
  msgstr "自动置备"
335
347
 
336
- #: ../app/helpers/discovered_hosts_helper.rb:15
337
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
348
+ #: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
338
349
  msgid "Refresh facts"
339
350
  msgstr "刷新详情"
340
351
 
341
- #: ../app/helpers/discovered_hosts_helper.rb:16
342
- #: ../app/helpers/discovered_hosts_helper.rb:30
343
- #: ../app/models/setting/discovered.rb:22
344
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
352
+ #: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
345
353
  msgid "Reboot"
346
354
  msgstr "重启"
347
355
 
@@ -349,13 +357,11 @@ msgstr "重启"
349
357
  msgid "Back"
350
358
  msgstr "后退"
351
359
 
352
- #: ../app/helpers/discovered_hosts_helper.rb:21
353
- #: ../app/helpers/discovered_hosts_helper.rb:35
360
+ #: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
354
361
  msgid "Select Action"
355
362
  msgstr "选择动作"
356
363
 
357
- #: ../app/helpers/discovered_hosts_helper.rb:23
358
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
364
+ #: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
359
365
  msgid "Delete %s?"
360
366
  msgstr "删除 %s"
361
367
 
@@ -375,8 +381,7 @@ msgstr "删除"
375
381
  msgid "%s - The following hosts are about to be changed"
376
382
  msgstr "%s - 要更改以下主机"
377
383
 
378
- #: ../app/helpers/discovered_hosts_helper.rb:46
379
- #: ../app/views/dashboard/_discovery_widget_host.html.erb:2
384
+ #: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
380
385
  msgid "N/A"
381
386
  msgstr "N/A"
382
387
 
@@ -396,12 +401,7 @@ msgstr "最近 7 天内报告"
396
401
  msgid "Provision"
397
402
  msgstr "供应"
398
403
 
399
- #: ../app/helpers/discovery_rules_helper.rb:26
400
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1
401
- #: ../app/views/discovered_hosts/welcome.html.erb:1
402
- #: ../app/views/discovered_hosts/welcome.html.erb:6
403
- #: ../lib/foreman_discovery/engine.rb:158
404
- #: ../lib/foreman_discovery/engine.rb:173
404
+ #: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:159 ../lib/foreman_discovery/engine.rb:174
405
405
  msgid "Discovered Hosts"
406
406
  msgstr "发现主机"
407
407
 
@@ -450,17 +450,16 @@ msgid "must be present."
450
450
  msgstr "必须存在。"
451
451
 
452
452
  #: ../app/models/discovery_rule.rb:52
453
- msgid ""
454
- "Host group organization %s must also be associated to the discovery rule"
455
- msgid_plural ""
456
- "Host group organizations %s must also be associated to the discovery rule"
453
+ msgid "Host group organization %s must also be associated to the discovery rule"
454
+ msgid_plural "Host group organizations %s must also be associated to the discovery rule"
457
455
  msgstr[0] ""
456
+ msgstr[1] ""
458
457
 
459
458
  #: ../app/models/discovery_rule.rb:56
460
459
  msgid "Host group location %s must also be associated to the discovery rule"
461
- msgid_plural ""
462
- "Host group locations %s must also be associated to the discovery rule"
460
+ msgid_plural "Host group locations %s must also be associated to the discovery rule"
463
461
  msgstr[0] ""
462
+ msgstr[1] ""
464
463
 
465
464
  #: ../app/models/host/discovered.rb:40
466
465
  msgid "Fact + prefix"
@@ -474,39 +473,39 @@ msgstr "随机名"
474
473
  msgid "MAC-based name"
475
474
  msgstr "基于 MAC 的名称"
476
475
 
477
- #: ../app/models/host/discovered.rb:51
476
+ #: ../app/models/host/discovered.rb:55
478
477
  msgid "Invalid facts, must be a Hash"
479
478
  msgstr "无效详情,必须是 Hash"
480
479
 
481
- #: ../app/models/host/discovered.rb:56
482
- msgid ""
483
- "Expected discovery_fact '%s' is missing, unable to detect primary interface "
484
- "and set hostname"
480
+ #: ../app/models/host/discovered.rb:60
481
+ msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
485
482
  msgstr "期望的 discovery_fact '%s' 缺失,无法检测主接口和设置主机名称"
486
483
 
487
- #: ../app/models/host/discovered.rb:69
488
- msgid ""
489
- "Invalid facts: hash does not contain a valid value for any of the facts in "
490
- "the discovery_hostname setting: %s"
484
+ #: ../app/models/host/discovered.rb:73
485
+ msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
491
486
  msgstr "无效详情:hash 不包含 discovery_hostname 设置中任何详情的有效值:%s"
492
487
 
493
- #: ../app/models/host/discovered.rb:95
488
+ #: ../app/models/host/discovered.rb:100
494
489
  msgid "Facts could not be imported"
495
490
  msgstr "无法导入详情"
496
491
 
497
- #: ../app/models/host/discovered.rb:150
492
+ #: ../app/models/host/discovered.rb:146
498
493
  msgid "Could not get facts from proxy %{url}: %{error}"
499
494
  msgstr "无法从代理 %{url} 获得详情:%{error}"
500
495
 
501
- #: ../app/models/host/discovered.rb:158
502
- msgid "Unable to reboot %{name} via %{url}: %{msg}"
503
- msgstr "无法通过 %{url} 重启 %{name} :%{msg}"
496
+ #: ../app/models/host/discovered.rb:160
497
+ msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
498
+ msgstr ""
499
+
500
+ #: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
501
+ msgid "Unable to perform %{action} on %{ips}"
502
+ msgstr ""
504
503
 
505
- #: ../app/models/host/discovered.rb:166
506
- msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
507
- msgstr "无法通过 %{url} 在 %{name} 上执行 kexec:%{msg}"
504
+ #: ../app/models/host/discovered.rb:179
505
+ msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
506
+ msgstr ""
508
507
 
509
- #: ../app/models/host/discovered.rb:185
508
+ #: ../app/models/host/discovered.rb:203
510
509
  msgid "Invalid hostname: Could not normalize the hostname"
511
510
  msgstr "无效的主机名:无法标准化主机名"
512
511
 
@@ -534,191 +533,183 @@ msgstr "Init RAM kexec URL 无效:'%s'"
534
533
  msgid "Rebuild DNS for %s"
535
534
  msgstr "为 %s 重建 DNS"
536
535
 
537
- #: ../app/models/setting/discovered.rb:15
536
+ #: ../app/models/setting/discovered.rb:17
538
537
  msgid "The default location to place discovered hosts in"
539
538
  msgstr "找到主机的默认位置"
540
539
 
541
- #: ../app/models/setting/discovered.rb:15
540
+ #: ../app/models/setting/discovered.rb:17
542
541
  msgid "Discovery location"
543
542
  msgstr "发现位置"
544
543
 
545
- #: ../app/models/setting/discovered.rb:16
544
+ #: ../app/models/setting/discovered.rb:18
546
545
  msgid "The default organization to place discovered hosts in"
547
546
  msgstr "找到主机的默认机构"
548
547
 
549
- #: ../app/models/setting/discovered.rb:16
548
+ #: ../app/models/setting/discovered.rb:18
550
549
  msgid "Discovery organization"
551
550
  msgstr "发现机构"
552
551
 
553
- #: ../app/models/setting/discovered.rb:17
552
+ #: ../app/models/setting/discovered.rb:19
554
553
  msgid "Fact name to use for primary interface detection"
555
554
  msgstr "用于主接口检测的详情名称"
556
555
 
557
- #: ../app/models/setting/discovered.rb:17
556
+ #: ../app/models/setting/discovered.rb:19
558
557
  msgid "Interface fact"
559
558
  msgstr "接口详情"
560
559
 
561
- #: ../app/models/setting/discovered.rb:18
562
- msgid ""
563
- "Automatic bond interface (if another interface is detected on the same VLAN "
564
- "via LLDP)"
560
+ #: ../app/models/setting/discovered.rb:20
561
+ msgid "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
565
562
  msgstr "自动绑定接口(如果通过 LLDP 在同一个 VLAN 中发现另外一个接口)"
566
563
 
567
- #: ../app/models/setting/discovered.rb:18
564
+ #: ../app/models/setting/discovered.rb:20
568
565
  msgid "Create bond interfaces"
569
566
  msgstr "创建绑定接口"
570
567
 
571
- #: ../app/models/setting/discovered.rb:19
568
+ #: ../app/models/setting/discovered.rb:21
572
569
  msgid "Clean all reported facts during provisioning (except discovery facts)"
573
570
  msgstr "置备期间清除所有报告的详情(发现详情除外)"
574
571
 
575
- #: ../app/models/setting/discovered.rb:19
572
+ #: ../app/models/setting/discovered.rb:21
576
573
  msgid "Clean all facts"
577
574
  msgstr "清除所有详情"
578
575
 
579
- #: ../app/models/setting/discovered.rb:20
576
+ #: ../app/models/setting/discovered.rb:22
580
577
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
581
578
  msgstr "用于主机名的详情列表(用逗号隔开,首个 wins)"
582
579
 
583
- #: ../app/models/setting/discovered.rb:20
580
+ #: ../app/models/setting/discovered.rb:22
584
581
  msgid "Hostname facts"
585
582
  msgstr "主机名详情"
586
583
 
587
- #: ../app/models/setting/discovered.rb:21
588
- msgid ""
589
- "Automatically provision newly discovered hosts, according to the "
590
- "provisioning rules"
584
+ #: ../app/models/setting/discovered.rb:23
585
+ msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
591
586
  msgstr "根据置备规则,自动置备新发现主机"
592
587
 
593
- #: ../app/models/setting/discovered.rb:21
588
+ #: ../app/models/setting/discovered.rb:23
594
589
  msgid "Auto provisioning"
595
590
  msgstr "自动置备"
596
591
 
597
- #: ../app/models/setting/discovered.rb:22
592
+ #: ../app/models/setting/discovered.rb:24
598
593
  msgid "Automatically reboot or kexec discovered host during provisioning"
599
594
  msgstr "置备期间自动重启或 kexec 发现主机"
600
595
 
601
- #: ../app/models/setting/discovered.rb:23
596
+ #: ../app/models/setting/discovered.rb:25
602
597
  msgid "The default prefix to use for the host name, must start with a letter"
603
598
  msgstr "使用的主机名默认前缀必须以字母开头"
604
599
 
605
- #: ../app/models/setting/discovered.rb:23
600
+ #: ../app/models/setting/discovered.rb:25
606
601
  msgid "Hostname prefix"
607
602
  msgstr "主机名前缀"
608
603
 
609
- #: ../app/models/setting/discovered.rb:24
604
+ #: ../app/models/setting/discovered.rb:26
610
605
  msgid "Extra facter columns to show in host lists (separate by comma)"
611
606
  msgstr "在主机列表中显示的额外 facter 列(用逗号隔开)"
612
607
 
613
- #: ../app/models/setting/discovered.rb:24
608
+ #: ../app/models/setting/discovered.rb:26
614
609
  msgid "Fact columns"
615
610
  msgstr "详情列"
616
611
 
617
- #: ../app/models/setting/discovered.rb:25
612
+ #: ../app/models/setting/discovered.rb:27
618
613
  msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
619
614
  msgstr "组织高亮部分详情的正则表达式 - 例如 ^(abc|cde)$"
620
615
 
621
- #: ../app/models/setting/discovered.rb:25
616
+ #: ../app/models/setting/discovered.rb:27
622
617
  msgid "Highlighted facts"
623
618
  msgstr "高亮详情"
624
619
 
625
- #: ../app/models/setting/discovered.rb:26
620
+ #: ../app/models/setting/discovered.rb:28
626
621
  msgid "Regex to organize facts for storage section"
627
622
  msgstr "组织存储部分详情的正则表达式"
628
623
 
629
- #: ../app/models/setting/discovered.rb:26
624
+ #: ../app/models/setting/discovered.rb:28
630
625
  msgid "Storage facts"
631
626
  msgstr "存储详情"
632
627
 
633
- #: ../app/models/setting/discovered.rb:27
628
+ #: ../app/models/setting/discovered.rb:29
634
629
  msgid "Regex to organize facts for software section"
635
630
  msgstr "组织软件部分详情的正则表达式"
636
631
 
637
- #: ../app/models/setting/discovered.rb:27
632
+ #: ../app/models/setting/discovered.rb:29
638
633
  msgid "Software facts"
639
634
  msgstr "软件详情"
640
635
 
641
- #: ../app/models/setting/discovered.rb:28
636
+ #: ../app/models/setting/discovered.rb:30
642
637
  msgid "Regex to organize facts for hardware section"
643
638
  msgstr "组织硬件部分详情的正则表达式"
644
639
 
645
- #: ../app/models/setting/discovered.rb:28
640
+ #: ../app/models/setting/discovered.rb:30
646
641
  msgid "Hardware facts"
647
642
  msgstr "硬件详情"
648
643
 
649
- #: ../app/models/setting/discovered.rb:29
644
+ #: ../app/models/setting/discovered.rb:31
650
645
  msgid "Regex to organize facts for network section"
651
646
  msgstr "组织网络部分详情的正则表达式"
652
647
 
653
- #: ../app/models/setting/discovered.rb:29
648
+ #: ../app/models/setting/discovered.rb:31
654
649
  msgid "Network facts"
655
650
  msgstr "网络详情"
656
651
 
657
- #: ../app/models/setting/discovered.rb:30
652
+ #: ../app/models/setting/discovered.rb:32
658
653
  msgid "Regex to organize facts for ipmi section"
659
654
  msgstr "组织 ipmi 部分详情的正则表达式"
660
655
 
661
- #: ../app/models/setting/discovered.rb:30
656
+ #: ../app/models/setting/discovered.rb:32
662
657
  msgid "IPMI facts"
663
658
  msgstr "IPMI 详情"
664
659
 
665
- #: ../app/models/setting/discovered.rb:31
666
- msgid ""
667
- "Automatically generate PXE configuration to pin a newly discovered host to "
668
- "discovery"
660
+ #: ../app/models/setting/discovered.rb:33
661
+ msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
669
662
  msgstr "自动生成 PXE 配置,以将新发现主机固定至发现"
670
663
 
671
- #: ../app/models/setting/discovered.rb:31
664
+ #: ../app/models/setting/discovered.rb:33
672
665
  msgid "Lock PXE"
673
666
  msgstr "锁定 PXE"
674
667
 
675
- #: ../app/models/setting/discovered.rb:32
668
+ #: ../app/models/setting/discovered.rb:34
676
669
  msgid "PXELinux template to be used when pinning a host to discovery"
677
670
  msgstr "将主机固定至发现时使用的 PXELinux 模板"
678
671
 
679
- #: ../app/models/setting/discovered.rb:32
672
+ #: ../app/models/setting/discovered.rb:34
680
673
  msgid "Locked PXELinux template name"
681
674
  msgstr "锁定的 PXELinux 模板名称"
682
675
 
683
- #: ../app/models/setting/discovered.rb:33
676
+ #: ../app/models/setting/discovered.rb:35
684
677
  msgid "PXEGrub template to be used when pinning a host to discovery"
685
678
  msgstr "将主机固定至发现时使用的 PXEGrub 模板"
686
679
 
687
- #: ../app/models/setting/discovered.rb:33
680
+ #: ../app/models/setting/discovered.rb:35
688
681
  msgid "Locked PXEGrub template name"
689
682
  msgstr "锁定的 PXEGrub 模板名称"
690
683
 
691
- #: ../app/models/setting/discovered.rb:34
684
+ #: ../app/models/setting/discovered.rb:36
692
685
  msgid "PXEGrub2 template to be used when pinning a host to discovery"
693
686
  msgstr "将主机固定至发现时使用的 PXEGrub2 模板"
694
687
 
695
- #: ../app/models/setting/discovered.rb:34
688
+ #: ../app/models/setting/discovered.rb:36
696
689
  msgid "Locked PXEGrub2 template name"
697
690
  msgstr "锁定的 PXEGrub2 模板名称"
698
691
 
699
- #: ../app/models/setting/discovered.rb:35
692
+ #: ../app/models/setting/discovered.rb:37
700
693
  msgid "Force DNS entries creation when provisioning discovered host"
701
694
  msgstr "置备发现主机时强制 DNS 条目创建"
702
695
 
703
- #: ../app/models/setting/discovered.rb:35
696
+ #: ../app/models/setting/discovered.rb:37
704
697
  msgid "Force DNS"
705
698
  msgstr "强制 DNS"
706
699
 
707
- #: ../app/models/setting/discovered.rb:36
708
- msgid ""
709
- "Do not allow to discover existing managed host matching MAC of a "
710
- "provisioning NIC (errors out early)"
700
+ #: ../app/models/setting/discovered.rb:38
701
+ msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
711
702
  msgstr "不允许发现匹配一个置备 NIC 的 MAC 的已存在的管理的主机(早期出现错误)"
712
703
 
713
- #: ../app/models/setting/discovered.rb:36
704
+ #: ../app/models/setting/discovered.rb:38
714
705
  msgid "Error on existing NIC"
715
706
  msgstr "已存在的 NIC 上的错误"
716
707
 
717
- #: ../app/models/setting/discovered.rb:37
708
+ #: ../app/models/setting/discovered.rb:39
718
709
  msgid "Discovery hostname naming pattern"
719
710
  msgstr "发现主机名的名称特征"
720
711
 
721
- #: ../app/models/setting/discovered.rb:37
712
+ #: ../app/models/setting/discovered.rb:39
722
713
  msgid "Type of name generator"
723
714
  msgstr "名称生成器类型"
724
715
 
@@ -731,23 +722,27 @@ msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
731
722
  msgstr "发现的主机 '%{host}' 的所有 NIC 都被过滤掉,过滤:%{filter}"
732
723
 
733
724
  #: ../app/services/foreman_discovery/fact_parser.rb:12
734
- msgid ""
735
- "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: "
736
- "%{filter}"
725
+ msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
737
726
  msgstr "无法找到带有 '%{fact}' 指定的 %{mac} 的主 NIC。NIC 过滤:%{filter}"
738
727
 
739
- #: ../app/services/foreman_discovery/host_converter.rb:39
728
+ #: ../app/services/foreman_discovery/host_converter.rb:47
740
729
  msgid "IPAM must be configured for subnet '%s'"
741
730
  msgstr ""
742
731
 
743
- #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
732
+ #: ../app/services/foreman_discovery/node_api/node_resource.rb:76
744
733
  msgid "Image API returned HTTP/%{code} with '%{body}"
745
734
  msgstr "镜像 API 返回 HTTP/%{code} 与 '%{body}"
746
735
 
747
- #: ../app/services/foreman_discovery/node_api/node_resource.rb:78
736
+ #: ../app/services/foreman_discovery/node_api/node_resource.rb:79
748
737
  msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
749
738
  msgstr "镜像 API 处理出错:%{msg}(HTTP/%{code},主体:%{body})"
750
739
 
740
+ #: ../app/views/dashboard/_discovery_widget.html.erb:5
741
+ msgid "Discovered Host"
742
+ msgid_plural "Discovered Hosts"
743
+ msgstr[0] ""
744
+ msgstr[1] ""
745
+
751
746
  #: ../app/views/dashboard/_discovery_widget.html.erb:9
752
747
  msgid "No discovered hosts available"
753
748
  msgstr "没有可用的发现主机"
@@ -756,33 +751,23 @@ msgstr "没有可用的发现主机"
756
751
  msgid "Host"
757
752
  msgstr "主机"
758
753
 
759
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
760
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
761
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
762
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:18
763
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:10
754
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../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
764
755
  msgid "Model"
765
756
  msgstr "型号"
766
757
 
767
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
768
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
769
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:20
770
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:12
758
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
771
759
  msgid "CPUs"
772
760
  msgstr "CPU"
773
761
 
774
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
775
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
776
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:21
777
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:13
762
+ #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
778
763
  msgid "Memory"
779
764
  msgstr "内存"
780
765
 
781
- #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:25
766
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
782
767
  msgid "Customize Host"
783
768
  msgstr "自定义主机"
784
769
 
785
- #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:26
770
+ #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
786
771
  msgid "Create Host"
787
772
  msgstr "创建主机"
788
773
 
@@ -794,16 +779,11 @@ msgstr "选择本页中的所有项目"
794
779
  msgid "items selected. Uncheck to Clear"
795
780
  msgstr "已选择项目。取消选择清除。"
796
781
 
797
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
798
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
799
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:17
800
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:9
782
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5 ../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
801
783
  msgid "Name"
802
784
  msgstr "名称"
803
785
 
804
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
805
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:19
806
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:11
786
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
807
787
  msgid "IP Address"
808
788
  msgstr "IP 地址"
809
789
 
@@ -815,13 +795,11 @@ msgstr "磁盘计数"
815
795
  msgid "Disks Size"
816
796
  msgstr "磁盘大小"
817
797
 
818
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15
819
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:9
798
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
820
799
  msgid "Location"
821
800
  msgstr "位置"
822
801
 
823
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16
824
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
802
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
825
803
  msgid "Organization"
826
804
  msgstr "机构"
827
805
 
@@ -833,8 +811,7 @@ msgstr "子网"
833
811
  msgid "Last Facts Upload"
834
812
  msgstr "最后详情上传"
835
813
 
836
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
837
- #: ../app/views/discovery_rules/index.html.erb:12
814
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19 ../app/views/discovery_rules/index.html.erb:12
838
815
  msgid "Actions"
839
816
  msgstr "操作"
840
817
 
@@ -855,9 +832,7 @@ msgid "Provision %s"
855
832
  msgstr "置备 %s"
856
833
 
857
834
  #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
858
- msgid ""
859
- "This might take a while, as all hosts, facts and reports will be destroyed "
860
- "as well"
835
+ msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
861
836
  msgstr "这需要一些时间,因为同时还要删除所有主机、详情及报告。"
862
837
 
863
838
  #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -896,20 +871,6 @@ msgstr "IP 地址"
896
871
  msgid "Collapse All"
897
872
  msgstr "隐藏全部"
898
873
 
899
- #: ../app/views/discovered_hosts/welcome.html.erb:7
900
- msgid "No discovered hosts found in this context."
901
- msgstr "在此上下文中未找到发现主机。"
902
-
903
- #: ../app/views/discovered_hosts/welcome.html.erb:8
904
- msgid ""
905
- "This page shows discovered bare-metal or virtual nodes waiting to be "
906
- "provisioned."
907
- msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
908
-
909
- #: ../app/views/discovered_hosts/welcome.html.erb:9
910
- msgid "Learn more about this in the documentation."
911
- msgstr "在本文档中了解更多这方面的内容。"
912
-
913
874
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
914
875
  msgid "Summary report for discovered hosts from Foreman"
915
876
  msgstr "来自 Foreman 的 发现主机概述报告"
@@ -918,23 +879,19 @@ msgstr "来自 Foreman 的 发现主机概述报告"
918
879
  msgid "<b>Foreman</b> Discovered hosts summary"
919
880
  msgstr "<b>Foreman</b> 发现主机概述"
920
881
 
921
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:10
922
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:5
882
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:10 ../app/views/discovered_mailer/discovered_summary.text.erb:5
923
883
  msgid "Summary from %{time} ago to %{now}"
924
884
  msgstr "从 %{time} 前到 %{now} 的概述"
925
885
 
926
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:11
927
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:3
886
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:11 ../app/views/discovered_mailer/discovered_summary.text.erb:3
928
887
  msgid "Discovered hosts from Foreman server at %{foreman_url}"
929
888
  msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
930
889
 
931
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:22
932
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:14
890
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
933
891
  msgid "Disk count"
934
892
  msgstr "磁盘计数"
935
893
 
936
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:23
937
- #: ../app/views/discovered_mailer/discovered_summary.text.erb:15
894
+ #: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
938
895
  msgid "Disks size"
939
896
  msgstr "磁盘大小"
940
897
 
@@ -983,41 +940,30 @@ msgid "Rule priority (lower integer means higher priority)"
983
940
  msgstr "规则优先级(整数越小,优先级越高)"
984
941
 
985
942
  #: ../app/views/discovery_rules/_template_inline.erb:2
986
- msgid ""
987
- "Specify target hostname template pattern in the same syntax as in "
988
- "Provisioning Templates (ERB)."
943
+ msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
989
944
  msgstr "以与置备模板 (ERB) 中相同的语法指定目标主机名模板模式。"
990
945
 
991
946
  #: ../app/views/discovery_rules/_template_inline.erb:4
992
- msgid ""
993
- "Domain will be appended automatically. A hostname based on MAC address will "
994
- "be used when left blank."
947
+ msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
995
948
  msgstr "域将自动附加。留空时将使用基于 MAC 地址的主机名。"
996
949
 
997
950
  #: ../app/views/discovery_rules/_template_inline.erb:5
998
- msgid ""
999
- "In addition to @host attribute function rand for random integers is "
1000
- "available. Examples:"
951
+ msgid "In addition to @host attribute function rand for random integers is available. Examples:"
1001
952
  msgstr "除了 @host 属性函数之外,还提供随机整数 rand。"
1002
953
 
1003
954
  #: ../app/views/discovery_rules/_template_inline.erb:8
1004
- msgid ""
1005
- "When creating hostname patterns, make sure the resulting host names are "
1006
- "unique."
955
+ msgid "When creating hostname patterns, make sure the resulting host names are unique."
1007
956
  msgstr "创建主机名模式时,确保生成的主机名是唯一的。"
1008
957
 
1009
958
  #: ../app/views/discovery_rules/_template_inline.erb:9
1010
- msgid ""
1011
- "Hostnames must not start with numbers. A good approach is to use unique "
1012
- "information provided by facter (MAC address, BIOS or serial ID)."
959
+ msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
1013
960
  msgstr "主机名不得以数字开始。一种好方法是使用 facter 提供的独特信息(MAC 地址、BIOS 或序列 ID)。"
1014
961
 
1015
962
  #: ../app/views/discovery_rules/edit.html.erb:1
1016
963
  msgid "Edit %s"
1017
964
  msgstr "编辑 %s"
1018
965
 
1019
- #: ../app/views/discovery_rules/index.html.erb:1
1020
- #: ../lib/foreman_discovery/engine.rb:163
966
+ #: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:164
1021
967
  msgid "Discovery Rules"
1022
968
  msgstr "发现规则"
1023
969
 
@@ -1073,38 +1019,43 @@ msgstr "已发现一个或多个主机"
1073
1019
  msgid "Details"
1074
1020
  msgstr "详情"
1075
1021
 
1076
- #: ../lib/foreman_discovery/engine.rb:179
1022
+ #: ../lib/foreman_discovery/engine.rb:180
1077
1023
  msgid "Discovery Kexec template"
1078
1024
  msgstr "发现 Kexec 模板"
1079
1025
 
1080
- #: ../lib/foreman_discovery/engine.rb:188
1026
+ #: ../lib/foreman_discovery/engine.rb:189
1081
1027
  msgid "Discovery Proxy"
1082
1028
  msgstr "发现代理服务器"
1083
1029
 
1084
- #: ../lib/foreman_discovery/engine.rb:189
1085
- msgid ""
1086
- "Discovery Proxy to use within this subnet for managing connection to "
1087
- "discovered hosts"
1030
+ #: ../lib/foreman_discovery/engine.rb:190
1031
+ msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1088
1032
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
1089
1033
 
1090
- #: ../lib/foreman_discovery/engine.rb:190
1091
- msgid ""
1092
- "ID of Discovery Proxy to use within this subnet for managing connection to "
1093
- "discovered hosts"
1034
+ #: ../lib/foreman_discovery/engine.rb:191
1035
+ msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1094
1036
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
1095
1037
 
1096
1038
  #: action_names.rb:2
1097
- msgid "Import Puppet classes"
1098
- msgstr "导入 Puppet 类"
1039
+ msgid "Remote action:"
1040
+ msgstr ""
1099
1041
 
1100
1042
  #: action_names.rb:3
1101
- msgid "Import facts"
1102
- msgstr "导入 fact"
1043
+ msgid "Import Puppet classes"
1044
+ msgstr ""
1103
1045
 
1104
1046
  #: action_names.rb:4
1105
1047
  msgid "Action with sub plans"
1106
- msgstr "带有子计划的操作"
1048
+ msgstr ""
1107
1049
 
1108
1050
  #: action_names.rb:5
1109
- msgid "Remote action:"
1110
- msgstr "远程操作:"
1051
+ msgid "Import facts"
1052
+ msgstr ""
1053
+
1054
+ #~ msgid "Learn more about this in the documentation."
1055
+ #~ msgstr "在本文档中了解更多这方面的内容。"
1056
+ #~ msgid "No discovered hosts found in this context."
1057
+ #~ msgstr "在此上下文中未找到发现主机。"
1058
+ #~ msgid ""
1059
+ #~ "This page shows discovered bare-metal or virtual nodes waiting to be provision"
1060
+ #~ "ed."
1061
+ #~ msgstr "此页显示了等待置备的发现裸机或虚拟节点。"