foreman_discovery 15.1.0 → 16.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (82) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +10 -3
  3. data/app/controllers/api/v2/discovery_rules_controller.rb +1 -1
  4. data/app/controllers/concerns/foreman/controller/discovered_extensions.rb +4 -0
  5. data/app/controllers/discovered_hosts_controller.rb +1 -0
  6. data/app/controllers/discovery_rules_controller.rb +1 -1
  7. data/app/models/discovery_rule.rb +1 -1
  8. data/app/models/host/discovered.rb +39 -17
  9. data/app/models/host/managed_extensions.rb +2 -2
  10. data/app/models/setting/discovered.rb +26 -33
  11. data/app/services/foreman_discovery/fact_parser.rb +1 -1
  12. data/app/services/foreman_discovery/host_converter.rb +38 -2
  13. data/app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb +6 -14
  14. data/app/services/foreman_discovery/node_api/node_resource.rb +1 -0
  15. data/app/services/foreman_discovery/subnet_suggestion.rb +26 -0
  16. data/app/views/discovered_hosts/_discovered_host_modal.html.erb +2 -0
  17. data/app/views/foreman_discovery/debian_kexec.erb +1 -1
  18. data/config/routes.rb +2 -0
  19. data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb +1 -1
  20. data/db/migrate/20151023144501_regenerate_red_hat_kexec.rb +1 -1
  21. data/db/migrate/20180412124505_add_priority_score_to_discovery_rules.rb +1 -1
  22. data/extra/discover-host +21 -7
  23. data/lib/foreman_discovery/engine.rb +4 -4
  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 +226 -263
  27. data/locale/ca/foreman_discovery.po +28 -8
  28. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  29. data/locale/de/foreman_discovery.edit.po +229 -265
  30. data/locale/de/foreman_discovery.po +31 -11
  31. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  32. data/locale/en/foreman_discovery.edit.po +169 -119
  33. data/locale/en/foreman_discovery.po +24 -4
  34. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  35. data/locale/en_GB/foreman_discovery.edit.po +237 -266
  36. data/locale/en_GB/foreman_discovery.po +31 -11
  37. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  38. data/locale/es/foreman_discovery.edit.po +236 -265
  39. data/locale/es/foreman_discovery.po +30 -10
  40. data/locale/foreman_discovery.pot +110 -84
  41. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  42. data/locale/fr/foreman_discovery.edit.po +230 -262
  43. data/locale/fr/foreman_discovery.po +28 -8
  44. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  45. data/locale/gl/foreman_discovery.edit.po +221 -261
  46. data/locale/gl/foreman_discovery.po +26 -6
  47. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  48. data/locale/it/foreman_discovery.edit.po +221 -261
  49. data/locale/it/foreman_discovery.po +26 -6
  50. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  51. data/locale/ja/foreman_discovery.edit.po +235 -264
  52. data/locale/ja/foreman_discovery.po +29 -9
  53. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  54. data/locale/ko/foreman_discovery.edit.po +223 -262
  55. data/locale/ko/foreman_discovery.po +28 -8
  56. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  57. data/locale/pt_BR/foreman_discovery.edit.po +233 -264
  58. data/locale/pt_BR/foreman_discovery.po +29 -9
  59. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  60. data/locale/ru/foreman_discovery.edit.po +227 -265
  61. data/locale/ru/foreman_discovery.po +29 -9
  62. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  63. data/locale/sv_SE/foreman_discovery.edit.po +222 -262
  64. data/locale/sv_SE/foreman_discovery.po +27 -7
  65. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  66. data/locale/zh_CN/foreman_discovery.edit.po +234 -263
  67. data/locale/zh_CN/foreman_discovery.po +28 -8
  68. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  69. data/locale/zh_TW/foreman_discovery.edit.po +223 -261
  70. data/locale/zh_TW/foreman_discovery.po +26 -6
  71. data/test/facts/bond0-eth0-eth1-active-passive.json +128 -0
  72. data/test/facts/facts_with_lldp_bond_candidate.json +2 -9
  73. data/test/functional/api/v2/discovered_hosts_controller_test.rb +1 -0
  74. data/test/functional/discovered_hosts_controller_test.rb +15 -6
  75. data/test/integration/discovered_hosts_test.rb +1 -0
  76. data/test/test_helper_discovery.rb +12 -0
  77. data/test/unit/discovered_extensions_test.rb +54 -0
  78. data/test/unit/discovery_attribute_set_test.rb +1 -0
  79. data/test/unit/discovery_rule_test.rb +1 -0
  80. data/test/unit/host_discovered_test.rb +32 -13
  81. data/test/unit/managed_extensions_test.rb +2 -0
  82. metadata +36 -31
@@ -3,15 +3,15 @@
3
3
  # This file is distributed under the same license as the foreman_discovery package.
4
4
  #
5
5
  # Translators:
6
- # Dominic Cleal <dominic@cleal.org>, 2014
6
+ # 0868a4d1af5275b3f70b0a6dac4c99a4, 2014
7
7
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
8
8
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_discovery 15.0.0\n"
11
+ "Project-Id-Version: foreman_discovery 16.0.1\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
- "PO-Revision-Date: 2019-04-18 19:36+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"
@@ -35,6 +35,9 @@ msgstr ""
35
35
  msgid "A summary of discovered hosts"
36
36
  msgstr ""
37
37
 
38
+ msgid "Action with sub plans"
39
+ msgstr ""
40
+
38
41
  msgid "Actions"
39
42
  msgstr "Åtgärder"
40
43
 
@@ -137,6 +140,11 @@ msgstr ""
137
140
  msgid "Disable rule '%s'?"
138
141
  msgstr ""
139
142
 
143
+ msgid "Discovered Host"
144
+ msgid_plural "Discovered Hosts"
145
+ msgstr[0] ""
146
+ msgstr[1] ""
147
+
140
148
  msgid "Discovered Hosts"
141
149
  msgstr "Hittade värdar"
142
150
 
@@ -348,6 +356,9 @@ msgstr "IPadress"
348
356
  msgid "IP address"
349
357
  msgstr ""
350
358
 
359
+ msgid "IPAM must be configured for subnet '%s'"
360
+ msgstr ""
361
+
351
362
  msgid "IPMI"
352
363
  msgstr ""
353
364
 
@@ -363,6 +374,12 @@ msgstr ""
363
374
  msgid "Image API returned HTTP/%{code} with '%{body}"
364
375
  msgstr ""
365
376
 
377
+ msgid "Import Puppet classes"
378
+ msgstr ""
379
+
380
+ msgid "Import facts"
381
+ msgstr ""
382
+
366
383
  msgid "In addition to @host attribute function rand for random integers is available. Examples:"
367
384
  msgstr ""
368
385
 
@@ -579,6 +596,9 @@ msgstr ""
579
596
  msgid "Reloading kernel on %s"
580
597
  msgstr ""
581
598
 
599
+ msgid "Remote action:"
600
+ msgstr ""
601
+
582
602
  msgid "Reported in the last 7 days"
583
603
  msgstr ""
584
604
 
@@ -678,13 +698,13 @@ msgstr ""
678
698
  msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
679
699
  msgstr ""
680
700
 
681
- msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
701
+ msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
682
702
  msgstr ""
683
703
 
684
- msgid "Unable to provision %{host}: %{errors}"
704
+ msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
685
705
  msgstr ""
686
706
 
687
- msgid "Unable to reboot %{name} via %{url}: %{msg}"
707
+ msgid "Unable to provision %{host}: %{errors}"
688
708
  msgstr ""
689
709
 
690
710
  msgid "Update a rule"
@@ -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.0.0\n"
8
+ "Project-Id-Version: foreman_discovery 16.3.4\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2019-05-13 15:39+0200\n"
11
- "PO-Revision-Date: 2019-04-18 19:36+0000\n"
12
- "Last-Translator: Lukáš Zapletal\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:159
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:166
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:172
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:175
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:128
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
@@ -215,11 +229,11 @@ msgstr "无法找到发现规则,未提供主机(检查许可)"
215
229
  msgid "No hostgroup associated with rule '%s'"
216
230
  msgstr "没有主机组与规则 '%s' 关联"
217
231
 
218
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:69
232
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
219
233
  msgid "Errors during reboot: %s"
220
234
  msgstr "重启期间出错:%s"
221
235
 
222
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:87
236
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
223
237
  msgid "No discovered hosts to reboot"
224
238
  msgstr "没有要重启的发现主机"
225
239
 
@@ -227,91 +241,91 @@ msgstr "没有要重启的发现主机"
227
241
  msgid "Successfully provisioned %s"
228
242
  msgstr "已成功置备 %s"
229
243
 
230
- #: ../app/controllers/discovered_hosts_controller.rb:96
244
+ #: ../app/controllers/discovered_hosts_controller.rb:97
231
245
  msgid "Facts refreshed for %s"
232
246
  msgstr "为 %s 刷新详情"
233
247
 
234
- #: ../app/controllers/discovered_hosts_controller.rb:98
248
+ #: ../app/controllers/discovered_hosts_controller.rb:99
235
249
  msgid "Failed to refresh facts for %s"
236
250
  msgstr "为 %s 刷新详情失败"
237
251
 
238
- #: ../app/controllers/discovered_hosts_controller.rb:101
252
+ #: ../app/controllers/discovered_hosts_controller.rb:102
239
253
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
240
254
  msgstr "为 %{hostname} 刷新详情失败,发生错误 %{error_message} "
241
255
 
242
- #: ../app/controllers/discovered_hosts_controller.rb:108
256
+ #: ../app/controllers/discovered_hosts_controller.rb:109
243
257
  msgid "Host of type %s can not be rebooted"
244
258
  msgstr "%s 类型的主机不能重启"
245
259
 
246
- #: ../app/controllers/discovered_hosts_controller.rb:112
260
+ #: ../app/controllers/discovered_hosts_controller.rb:113
247
261
  msgid "Rebooting host %s"
248
262
  msgstr "正在重启主机 %s"
249
263
 
250
- #: ../app/controllers/discovered_hosts_controller.rb:114
264
+ #: ../app/controllers/discovered_hosts_controller.rb:115
251
265
  msgid "Failed to reboot host %s"
252
266
  msgstr "无法重启主机 %s"
253
267
 
254
- #: ../app/controllers/discovered_hosts_controller.rb:117
268
+ #: ../app/controllers/discovered_hosts_controller.rb:118
255
269
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
256
270
  msgstr "无法重启主机 %{hostname},发生错误 %{error_message}"
257
271
 
258
- #: ../app/controllers/discovered_hosts_controller.rb:131
272
+ #: ../app/controllers/discovered_hosts_controller.rb:132
259
273
  msgid "Failed to reboot hosts with error %s"
260
274
  msgstr "无法重启主机,发生错误 %s"
261
275
 
262
- #: ../app/controllers/discovered_hosts_controller.rb:149
276
+ #: ../app/controllers/discovered_hosts_controller.rb:150
263
277
  msgid "Destroyed selected hosts"
264
278
  msgstr "消除所选主机"
265
279
 
266
- #: ../app/controllers/discovered_hosts_controller.rb:151
280
+ #: ../app/controllers/discovered_hosts_controller.rb:152
267
281
  msgid "The following hosts were not deleted: %s"
268
282
  msgstr "未删除以下主机:%s"
269
283
 
270
- #: ../app/controllers/discovered_hosts_controller.rb:163
284
+ #: ../app/controllers/discovered_hosts_controller.rb:164
271
285
  msgid "Failed to auto provision host %s: %s"
272
286
  msgstr "无法自动置备主机 %s:%s"
273
287
 
274
- #: ../app/controllers/discovered_hosts_controller.rb:191
288
+ #: ../app/controllers/discovered_hosts_controller.rb:192
275
289
  msgid "Discovered hosts are provisioning now"
276
290
  msgstr "现在发现主机正在置备"
277
291
 
278
- #: ../app/controllers/discovered_hosts_controller.rb:223
292
+ #: ../app/controllers/discovered_hosts_controller.rb:226
279
293
  msgid "Highlights"
280
294
  msgstr "亮点"
281
295
 
282
- #: ../app/controllers/discovered_hosts_controller.rb:223
296
+ #: ../app/controllers/discovered_hosts_controller.rb:226
283
297
  msgid "Storage"
284
298
  msgstr "存储"
285
299
 
286
- #: ../app/controllers/discovered_hosts_controller.rb:223
300
+ #: ../app/controllers/discovered_hosts_controller.rb:226
287
301
  msgid "Hardware"
288
302
  msgstr "硬件"
289
303
 
290
- #: ../app/controllers/discovered_hosts_controller.rb:223
304
+ #: ../app/controllers/discovered_hosts_controller.rb:226
291
305
  msgid "Network"
292
306
  msgstr "网络"
293
307
 
294
- #: ../app/controllers/discovered_hosts_controller.rb:223
308
+ #: ../app/controllers/discovered_hosts_controller.rb:226
295
309
  msgid "Software"
296
310
  msgstr "软件"
297
311
 
298
- #: ../app/controllers/discovered_hosts_controller.rb:223
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:223
316
+ #: ../app/controllers/discovered_hosts_controller.rb:226
303
317
  msgid "Miscellaneous"
304
318
  msgstr "杂项"
305
319
 
306
- #: ../app/controllers/discovered_hosts_controller.rb:301
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:305
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:311
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:26
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,63 +450,62 @@ 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
- #: ../app/models/host/discovered.rb:41
464
+ #: ../app/models/host/discovered.rb:40
466
465
  msgid "Fact + prefix"
467
466
  msgstr "Fact + 前缀"
468
467
 
469
- #: ../app/models/host/discovered.rb:42
468
+ #: ../app/models/host/discovered.rb:41
470
469
  msgid "Random name"
471
470
  msgstr "随机名"
472
471
 
473
- #: ../app/models/host/discovered.rb:43
472
+ #: ../app/models/host/discovered.rb:42
474
473
  msgid "MAC-based name"
475
474
  msgstr "基于 MAC 的名称"
476
475
 
477
- #: ../app/models/host/discovered.rb:52
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:57
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:70
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:96
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:151
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:159
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 ""
504
499
 
505
- #: ../app/models/host/discovered.rb:167
506
- msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
507
- msgstr "无法通过 %{url} 在 %{name} 上执行 kexec:%{msg}"
500
+ #: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
501
+ msgid "Unable to perform %{action} on %{ips}"
502
+ msgstr ""
508
503
 
509
- #: ../app/models/host/discovered.rb:186
504
+ #: ../app/models/host/discovered.rb:179
505
+ msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
506
+ msgstr ""
507
+
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:19
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:19
540
+ #: ../app/models/setting/discovered.rb:17
542
541
  msgid "Discovery location"
543
542
  msgstr "发现位置"
544
543
 
545
- #: ../app/models/setting/discovered.rb:20
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:20
548
+ #: ../app/models/setting/discovered.rb:18
550
549
  msgid "Discovery organization"
551
550
  msgstr "发现机构"
552
551
 
553
- #: ../app/models/setting/discovered.rb:21
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:21
556
+ #: ../app/models/setting/discovered.rb:19
558
557
  msgid "Interface fact"
559
558
  msgstr "接口详情"
560
559
 
561
- #: ../app/models/setting/discovered.rb:22
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:22
564
+ #: ../app/models/setting/discovered.rb:20
568
565
  msgid "Create bond interfaces"
569
566
  msgstr "创建绑定接口"
570
567
 
571
- #: ../app/models/setting/discovered.rb:23
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:23
572
+ #: ../app/models/setting/discovered.rb:21
576
573
  msgid "Clean all facts"
577
574
  msgstr "清除所有详情"
578
575
 
579
- #: ../app/models/setting/discovered.rb:24
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:24
580
+ #: ../app/models/setting/discovered.rb:22
584
581
  msgid "Hostname facts"
585
582
  msgstr "主机名详情"
586
583
 
587
- #: ../app/models/setting/discovered.rb:25
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:25
588
+ #: ../app/models/setting/discovered.rb:23
594
589
  msgid "Auto provisioning"
595
590
  msgstr "自动置备"
596
591
 
597
- #: ../app/models/setting/discovered.rb:26
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:27
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:27
600
+ #: ../app/models/setting/discovered.rb:25
606
601
  msgid "Hostname prefix"
607
602
  msgstr "主机名前缀"
608
603
 
609
- #: ../app/models/setting/discovered.rb:28
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:28
608
+ #: ../app/models/setting/discovered.rb:26
614
609
  msgid "Fact columns"
615
610
  msgstr "详情列"
616
611
 
617
- #: ../app/models/setting/discovered.rb:29
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:29
616
+ #: ../app/models/setting/discovered.rb:27
622
617
  msgid "Highlighted facts"
623
618
  msgstr "高亮详情"
624
619
 
625
- #: ../app/models/setting/discovered.rb:30
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:30
624
+ #: ../app/models/setting/discovered.rb:28
630
625
  msgid "Storage facts"
631
626
  msgstr "存储详情"
632
627
 
633
- #: ../app/models/setting/discovered.rb:31
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:31
632
+ #: ../app/models/setting/discovered.rb:29
638
633
  msgid "Software facts"
639
634
  msgstr "软件详情"
640
635
 
641
- #: ../app/models/setting/discovered.rb:32
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:32
640
+ #: ../app/models/setting/discovered.rb:30
646
641
  msgid "Hardware facts"
647
642
  msgstr "硬件详情"
648
643
 
649
- #: ../app/models/setting/discovered.rb:33
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:33
648
+ #: ../app/models/setting/discovered.rb:31
654
649
  msgid "Network facts"
655
650
  msgstr "网络详情"
656
651
 
657
- #: ../app/models/setting/discovered.rb:34
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:34
656
+ #: ../app/models/setting/discovered.rb:32
662
657
  msgid "IPMI facts"
663
658
  msgstr "IPMI 详情"
664
659
 
665
- #: ../app/models/setting/discovered.rb:35
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:35
664
+ #: ../app/models/setting/discovered.rb:33
672
665
  msgid "Lock PXE"
673
666
  msgstr "锁定 PXE"
674
667
 
675
- #: ../app/models/setting/discovered.rb:36
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:36
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:37
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:37
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:38
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:38
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:39
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:39
696
+ #: ../app/models/setting/discovered.rb:37
704
697
  msgid "Force DNS"
705
698
  msgstr "强制 DNS"
706
699
 
707
- #: ../app/models/setting/discovered.rb:40
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:40
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:41
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:41
712
+ #: ../app/models/setting/discovered.rb:39
722
713
  msgid "Type of name generator"
723
714
  msgstr "名称生成器类型"
724
715
 
@@ -731,19 +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/node_api/node_resource.rb:75
728
+ #: ../app/services/foreman_discovery/host_converter.rb:47
729
+ msgid "IPAM must be configured for subnet '%s'"
730
+ msgstr ""
731
+
732
+ #: ../app/services/foreman_discovery/node_api/node_resource.rb:76
740
733
  msgid "Image API returned HTTP/%{code} with '%{body}"
741
734
  msgstr "镜像 API 返回 HTTP/%{code} 与 '%{body}"
742
735
 
743
- #: ../app/services/foreman_discovery/node_api/node_resource.rb:78
736
+ #: ../app/services/foreman_discovery/node_api/node_resource.rb:79
744
737
  msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
745
738
  msgstr "镜像 API 处理出错:%{msg}(HTTP/%{code},主体:%{body})"
746
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
+
747
746
  #: ../app/views/dashboard/_discovery_widget.html.erb:9
748
747
  msgid "No discovered hosts available"
749
748
  msgstr "没有可用的发现主机"
@@ -752,25 +751,15 @@ msgstr "没有可用的发现主机"
752
751
  msgid "Host"
753
752
  msgstr "主机"
754
753
 
755
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
756
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
757
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
758
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:18
759
- #: ../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
760
755
  msgid "Model"
761
756
  msgstr "型号"
762
757
 
763
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
764
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
765
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:20
766
- #: ../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
767
759
  msgid "CPUs"
768
760
  msgstr "CPU"
769
761
 
770
- #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
771
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
772
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:21
773
- #: ../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
774
763
  msgid "Memory"
775
764
  msgstr "内存"
776
765
 
@@ -790,16 +779,11 @@ msgstr "选择本页中的所有项目"
790
779
  msgid "items selected. Uncheck to Clear"
791
780
  msgstr "已选择项目。取消选择清除。"
792
781
 
793
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
794
- #: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
795
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:17
796
- #: ../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
797
783
  msgid "Name"
798
784
  msgstr "名称"
799
785
 
800
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
801
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:19
802
- #: ../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
803
787
  msgid "IP Address"
804
788
  msgstr "IP 地址"
805
789
 
@@ -811,13 +795,11 @@ msgstr "磁盘计数"
811
795
  msgid "Disks Size"
812
796
  msgstr "磁盘大小"
813
797
 
814
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15
815
- #: ../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
816
799
  msgid "Location"
817
800
  msgstr "位置"
818
801
 
819
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16
820
- #: ../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
821
803
  msgid "Organization"
822
804
  msgstr "机构"
823
805
 
@@ -829,8 +811,7 @@ msgstr "子网"
829
811
  msgid "Last Facts Upload"
830
812
  msgstr "最后详情上传"
831
813
 
832
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
833
- #: ../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
834
815
  msgid "Actions"
835
816
  msgstr "操作"
836
817
 
@@ -851,9 +832,7 @@ msgid "Provision %s"
851
832
  msgstr "置备 %s"
852
833
 
853
834
  #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
854
- msgid ""
855
- "This might take a while, as all hosts, facts and reports will be destroyed "
856
- "as well"
835
+ msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
857
836
  msgstr "这需要一些时间,因为同时还要删除所有主机、详情及报告。"
858
837
 
859
838
  #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -892,20 +871,6 @@ msgstr "IP 地址"
892
871
  msgid "Collapse All"
893
872
  msgstr "隐藏全部"
894
873
 
895
- #: ../app/views/discovered_hosts/welcome.html.erb:7
896
- msgid "No discovered hosts found in this context."
897
- msgstr "在此上下文中未找到发现主机。"
898
-
899
- #: ../app/views/discovered_hosts/welcome.html.erb:8
900
- msgid ""
901
- "This page shows discovered bare-metal or virtual nodes waiting to be "
902
- "provisioned."
903
- msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
904
-
905
- #: ../app/views/discovered_hosts/welcome.html.erb:9
906
- msgid "Learn more about this in the documentation."
907
- msgstr "在本文档中了解更多这方面的内容。"
908
-
909
874
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
910
875
  msgid "Summary report for discovered hosts from Foreman"
911
876
  msgstr "来自 Foreman 的 发现主机概述报告"
@@ -914,23 +879,19 @@ msgstr "来自 Foreman 的 发现主机概述报告"
914
879
  msgid "<b>Foreman</b> Discovered hosts summary"
915
880
  msgstr "<b>Foreman</b> 发现主机概述"
916
881
 
917
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:10
918
- #: ../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
919
883
  msgid "Summary from %{time} ago to %{now}"
920
884
  msgstr "从 %{time} 前到 %{now} 的概述"
921
885
 
922
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:11
923
- #: ../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
924
887
  msgid "Discovered hosts from Foreman server at %{foreman_url}"
925
888
  msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
926
889
 
927
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:22
928
- #: ../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
929
891
  msgid "Disk count"
930
892
  msgstr "磁盘计数"
931
893
 
932
- #: ../app/views/discovered_mailer/discovered_summary.html.erb:23
933
- #: ../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
934
895
  msgid "Disks size"
935
896
  msgstr "磁盘大小"
936
897
 
@@ -979,41 +940,30 @@ msgid "Rule priority (lower integer means higher priority)"
979
940
  msgstr "规则优先级(整数越小,优先级越高)"
980
941
 
981
942
  #: ../app/views/discovery_rules/_template_inline.erb:2
982
- msgid ""
983
- "Specify target hostname template pattern in the same syntax as in "
984
- "Provisioning Templates (ERB)."
943
+ msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
985
944
  msgstr "以与置备模板 (ERB) 中相同的语法指定目标主机名模板模式。"
986
945
 
987
946
  #: ../app/views/discovery_rules/_template_inline.erb:4
988
- msgid ""
989
- "Domain will be appended automatically. A hostname based on MAC address will "
990
- "be used when left blank."
947
+ msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
991
948
  msgstr "域将自动附加。留空时将使用基于 MAC 地址的主机名。"
992
949
 
993
950
  #: ../app/views/discovery_rules/_template_inline.erb:5
994
- msgid ""
995
- "In addition to @host attribute function rand for random integers is "
996
- "available. Examples:"
951
+ msgid "In addition to @host attribute function rand for random integers is available. Examples:"
997
952
  msgstr "除了 @host 属性函数之外,还提供随机整数 rand。"
998
953
 
999
954
  #: ../app/views/discovery_rules/_template_inline.erb:8
1000
- msgid ""
1001
- "When creating hostname patterns, make sure the resulting host names are "
1002
- "unique."
955
+ msgid "When creating hostname patterns, make sure the resulting host names are unique."
1003
956
  msgstr "创建主机名模式时,确保生成的主机名是唯一的。"
1004
957
 
1005
958
  #: ../app/views/discovery_rules/_template_inline.erb:9
1006
- msgid ""
1007
- "Hostnames must not start with numbers. A good approach is to use unique "
1008
- "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)."
1009
960
  msgstr "主机名不得以数字开始。一种好方法是使用 facter 提供的独特信息(MAC 地址、BIOS 或序列 ID)。"
1010
961
 
1011
962
  #: ../app/views/discovery_rules/edit.html.erb:1
1012
963
  msgid "Edit %s"
1013
964
  msgstr "编辑 %s"
1014
965
 
1015
- #: ../app/views/discovery_rules/index.html.erb:1
1016
- #: ../lib/foreman_discovery/engine.rb:163
966
+ #: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:164
1017
967
  msgid "Discovery Rules"
1018
968
  msgstr "发现规则"
1019
969
 
@@ -1069,22 +1019,43 @@ msgstr "已发现一个或多个主机"
1069
1019
  msgid "Details"
1070
1020
  msgstr "详情"
1071
1021
 
1072
- #: ../lib/foreman_discovery/engine.rb:179
1022
+ #: ../lib/foreman_discovery/engine.rb:180
1073
1023
  msgid "Discovery Kexec template"
1074
1024
  msgstr "发现 Kexec 模板"
1075
1025
 
1076
- #: ../lib/foreman_discovery/engine.rb:188
1026
+ #: ../lib/foreman_discovery/engine.rb:189
1077
1027
  msgid "Discovery Proxy"
1078
1028
  msgstr "发现代理服务器"
1079
1029
 
1080
- #: ../lib/foreman_discovery/engine.rb:189
1081
- msgid ""
1082
- "Discovery Proxy to use within this subnet for managing connection to "
1083
- "discovered hosts"
1030
+ #: ../lib/foreman_discovery/engine.rb:190
1031
+ msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1084
1032
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
1085
1033
 
1086
- #: ../lib/foreman_discovery/engine.rb:190
1087
- msgid ""
1088
- "ID of Discovery Proxy to use within this subnet for managing connection to "
1089
- "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"
1090
1036
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
1037
+
1038
+ #: action_names.rb:2
1039
+ msgid "Remote action:"
1040
+ msgstr ""
1041
+
1042
+ #: action_names.rb:3
1043
+ msgid "Import Puppet classes"
1044
+ msgstr ""
1045
+
1046
+ #: action_names.rb:4
1047
+ msgid "Import facts"
1048
+ msgstr ""
1049
+
1050
+ #: action_names.rb:5
1051
+ msgid "Action with sub plans"
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 "此页显示了等待置备的发现裸机或虚拟节点。"