foreman_discovery 5.0.2 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (93) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +4 -7
  3. data/app/controllers/api/v2/discovery_rules_controller.rb +1 -0
  4. data/app/controllers/api/v2/fact_values_controller_extensions.rb +11 -0
  5. data/app/controllers/concerns/foreman/controller/discovered_extensions.rb +6 -3
  6. data/app/controllers/discovered_hosts_controller.rb +46 -11
  7. data/app/controllers/discovery_rules_controller.rb +1 -1
  8. data/app/helpers/discovered_hosts_helper.rb +33 -16
  9. data/app/models/concerns/discovery_taxonomy_extensions.rb +7 -0
  10. data/app/models/concerns/fact_value_extensions.rb +8 -0
  11. data/app/models/discovery_rule.rb +4 -6
  12. data/app/models/host/discovered.rb +29 -10
  13. data/app/models/host/managed_extensions.rb +2 -10
  14. data/app/models/setting/discovered.rb +22 -28
  15. data/app/services/foreman_discovery/host_converter.rb +19 -10
  16. data/app/views/api/v2/discovered_hosts/main.json.rabl +1 -1
  17. data/app/views/dashboard/_discovery_widget_host.html.erb +1 -1
  18. data/app/views/discovered_hosts/_discovered_host.html.erb +1 -1
  19. data/app/views/discovered_hosts/_discovered_hosts_list.html.erb +32 -1
  20. data/app/views/discovered_hosts/index.html.erb +2 -2
  21. data/app/views/discovered_hosts/show.html.erb +5 -5
  22. data/app/views/discovered_mailer/_discovered_host.html.erb +1 -1
  23. data/app/views/discovered_mailer/discovered_summary.text.erb +2 -2
  24. data/app/views/discovery_rules/_form.html.erb +2 -19
  25. data/app/views/discovery_rules/_template_inline.erb +10 -0
  26. data/app/views/discovery_rules/index.html.erb +1 -1
  27. data/app/views/foreman_discovery/debian_kexec.erb +34 -0
  28. data/app/views/foreman_discovery/redhat_kexec.erb +5 -4
  29. data/config/routes.rb +4 -0
  30. data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb +15 -1
  31. data/db/migrate/20160719124942_add_missing_view_permissions.rb +18 -0
  32. data/db/seeds.d/50_discovery_templates.rb +15 -13
  33. data/lib/discovery.rake +1 -0
  34. data/lib/foreman_discovery/engine.rb +24 -10
  35. data/lib/foreman_discovery/version.rb +1 -1
  36. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  37. data/locale/ca/foreman_discovery.edit.po +274 -136
  38. data/locale/ca/foreman_discovery.po +396 -328
  39. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  40. data/locale/de/foreman_discovery.edit.po +309 -171
  41. data/locale/de/foreman_discovery.po +419 -361
  42. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  43. data/locale/en/foreman_discovery.edit.po +881 -0
  44. data/locale/en/foreman_discovery.po +665 -0
  45. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  46. data/locale/en_GB/foreman_discovery.edit.po +279 -141
  47. data/locale/en_GB/foreman_discovery.po +446 -391
  48. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  49. data/locale/es/foreman_discovery.edit.po +277 -139
  50. data/locale/es/foreman_discovery.po +415 -362
  51. data/locale/foreman_discovery.pot +241 -135
  52. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  53. data/locale/fr/foreman_discovery.edit.po +289 -151
  54. data/locale/fr/foreman_discovery.po +439 -411
  55. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  56. data/locale/gl/foreman_discovery.edit.po +266 -128
  57. data/locale/gl/foreman_discovery.po +320 -246
  58. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  59. data/locale/it/foreman_discovery.edit.po +277 -139
  60. data/locale/it/foreman_discovery.po +407 -352
  61. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  62. data/locale/ja/foreman_discovery.edit.po +279 -141
  63. data/locale/ja/foreman_discovery.po +411 -339
  64. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  65. data/locale/ko/foreman_discovery.edit.po +277 -139
  66. data/locale/ko/foreman_discovery.po +411 -339
  67. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  68. data/locale/pt_BR/foreman_discovery.edit.po +282 -144
  69. data/locale/pt_BR/foreman_discovery.po +430 -394
  70. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  71. data/locale/ru/foreman_discovery.edit.po +371 -232
  72. data/locale/ru/foreman_discovery.po +448 -385
  73. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  74. data/locale/sv_SE/foreman_discovery.edit.po +270 -132
  75. data/locale/sv_SE/foreman_discovery.po +336 -260
  76. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  77. data/locale/zh_CN/foreman_discovery.edit.po +279 -141
  78. data/locale/zh_CN/foreman_discovery.po +412 -336
  79. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  80. data/locale/zh_TW/foreman_discovery.edit.po +279 -141
  81. data/locale/zh_TW/foreman_discovery.po +412 -338
  82. data/test/functional/api/v2/discovered_hosts_controller_test.rb +30 -22
  83. data/test/functional/api/v2/discovery_rules_controller_test.rb +7 -0
  84. data/test/functional/api/v2/fact_value_extensions_test.rb +37 -0
  85. data/test/functional/discovered_hosts_controller_test.rb +89 -16
  86. data/test/functional/discovery_rules_controller_test.rb +1 -1
  87. data/test/test_helper_discovery.rb +1 -1
  88. data/test/unit/discovered_extensions_test.rb +65 -21
  89. data/test/unit/discovery_attribute_set_test.rb +4 -4
  90. data/test/unit/discovery_taxonomy_extensions_test.rb +31 -0
  91. data/test/unit/host_discovered_test.rb +110 -14
  92. metadata +121 -110
  93. data/app/helpers/concerns/foreman_discovery/settings_helper_extensions.rb +0 -34
@@ -5,11 +5,11 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: Foreman\n"
8
+ "Project-Id-Version: foreman_discovery 5.0.2\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2016-02-25 10:58+0100\n"
11
- "PO-Revision-Date: 2016-03-08 17:54+0000\n"
12
- "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
10
+ "POT-Creation-Date: 2016-07-27 14:13+0200\n"
11
+ "PO-Revision-Date: 2016-07-28 09:01+0000\n"
12
+ "Last-Translator: Lukáš Zapletal\n"
13
13
  "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
14
14
  "MIME-Version: 1.0\n"
15
15
  "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,56 +87,56 @@ msgid ""
87
87
  "eth0 (example in case primary interface is named eth0)"
88
88
  msgstr ""
89
89
 
90
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:112
90
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:109
91
91
  msgid "Execute rules against a discovered host"
92
92
  msgstr "根据发现的主机执行规则"
93
93
 
94
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:118
95
- #: ../app/controllers/discovered_hosts_controller.rb:147
94
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:115
95
+ #: ../app/controllers/discovered_hosts_controller.rb:164
96
96
  msgid "Host %{host} was provisioned with rule %{rule}"
97
97
  msgstr "根据规则 %{rule} 供应主机 %{host}"
98
98
 
99
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:121
99
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:118
100
100
  msgid "Unable to provision %{host}: %{errors}"
101
101
  msgstr ""
102
102
 
103
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:127
104
- #: ../app/controllers/discovered_hosts_controller.rb:154
103
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:124
104
+ #: ../app/controllers/discovered_hosts_controller.rb:171
105
105
  msgid "No rule found for host %s"
106
106
  msgstr "未找到主机 %s 的规则"
107
107
 
108
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:134
108
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
109
109
  msgid "Execute rules against all currently discovered hosts"
110
110
  msgstr "根据所有目前已发现主机执行规则"
111
111
 
112
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
113
- #: ../app/controllers/discovered_hosts_controller.rb:160
112
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:135
113
+ #: ../app/controllers/discovered_hosts_controller.rb:177
114
114
  msgid "Errors during auto provisioning: %s"
115
115
  msgstr "自动供应时出错:%s"
116
116
 
117
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:141
118
- #: ../app/controllers/discovered_hosts_controller.rb:163
117
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
118
+ #: ../app/controllers/discovered_hosts_controller.rb:180
119
119
  msgid "No discovered hosts to provision"
120
120
  msgstr "没有发现的主机需要供应"
121
121
 
122
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:163
122
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:160
123
123
  msgid "%s discovered hosts were provisioned"
124
124
  msgstr ""
125
125
 
126
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:174
126
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:171
127
127
  msgid "Refreshing the facts of a discovered host"
128
128
  msgstr "刷新已发现主机的详情"
129
129
 
130
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:183
130
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
131
131
  msgid "Rebooting a discovered host"
132
132
  msgstr "重启已发现主机"
133
133
 
134
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:192
134
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:189
135
135
  msgid "Rebooting all discovered hosts"
136
136
  msgstr ""
137
137
 
138
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:203
139
- #: ../app/controllers/discovered_hosts_controller.rb:105
138
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
139
+ #: ../app/controllers/discovered_hosts_controller.rb:122
140
140
  msgid "Discovered hosts are rebooting now"
141
141
  msgstr ""
142
142
 
@@ -178,18 +178,22 @@ msgstr "按顺序排列规则,从最小的数字开始。数字必须大于 0"
178
178
  msgid "flag is used for temporary shutdown of rules"
179
179
  msgstr "用于临时关闭规则的标签"
180
180
 
181
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:41
181
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:42
182
182
  msgid "Create a discovery rule"
183
183
  msgstr "常见发现规则"
184
184
 
185
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:49
185
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:50
186
186
  msgid "Update a rule"
187
187
  msgstr "更新规则"
188
188
 
189
- #: ../app/controllers/api/v2/discovery_rules_controller.rb:57
189
+ #: ../app/controllers/api/v2/discovery_rules_controller.rb:58
190
190
  msgid "Delete a rule"
191
191
  msgstr "删除规则"
192
192
 
193
+ #: ../app/controllers/api/v2/fact_values_controller_extensions.rb:7
194
+ msgid "List all fact values of a given discovered host"
195
+ msgstr ""
196
+
193
197
  #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:6
194
198
  msgid "Unable to find a discovery rule, no host provided (check permissions)"
195
199
  msgstr ""
@@ -198,156 +202,186 @@ msgstr ""
198
202
  msgid "No hostgroup associated with rule '%s'"
199
203
  msgstr ""
200
204
 
201
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:63
205
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:66
202
206
  msgid "Errors during reboot: %s"
203
207
  msgstr ""
204
208
 
205
- #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:81
209
+ #: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:84
206
210
  msgid "No discovered hosts to reboot"
207
211
  msgstr ""
208
212
 
209
- #: ../app/controllers/discovered_hosts_controller.rb:73
213
+ #: ../app/controllers/discovered_hosts_controller.rb:58
214
+ msgid "Successfully provisioned %s"
215
+ msgstr ""
216
+
217
+ #: ../app/controllers/discovered_hosts_controller.rb:90
210
218
  msgid "Facts refreshed for %s"
211
219
  msgstr "为 %s 刷新详情"
212
220
 
213
- #: ../app/controllers/discovered_hosts_controller.rb:75
221
+ #: ../app/controllers/discovered_hosts_controller.rb:92
214
222
  msgid "Failed to refresh facts for %s"
215
223
  msgstr "为 %s 刷新详情失败"
216
224
 
217
- #: ../app/controllers/discovered_hosts_controller.rb:78
225
+ #: ../app/controllers/discovered_hosts_controller.rb:95
218
226
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
219
227
  msgstr ""
220
228
 
221
- #: ../app/controllers/discovered_hosts_controller.rb:85
229
+ #: ../app/controllers/discovered_hosts_controller.rb:102
222
230
  msgid "Host of type %s can not be rebooted"
223
231
  msgstr "无法重启主机类型 %s"
224
232
 
225
- #: ../app/controllers/discovered_hosts_controller.rb:89
233
+ #: ../app/controllers/discovered_hosts_controller.rb:106
226
234
  msgid "Rebooting host %s"
227
235
  msgstr "正在重启主机 %s"
228
236
 
229
- #: ../app/controllers/discovered_hosts_controller.rb:91
237
+ #: ../app/controllers/discovered_hosts_controller.rb:108
230
238
  msgid "Failed to reboot host %s"
231
239
  msgstr "重启主机 %s 失败"
232
240
 
233
- #: ../app/controllers/discovered_hosts_controller.rb:94
241
+ #: ../app/controllers/discovered_hosts_controller.rb:111
234
242
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
235
243
  msgstr "重启主机 %{hostname} 失败,并给出出错信息 %{error_message}"
236
244
 
237
- #: ../app/controllers/discovered_hosts_controller.rb:108
245
+ #: ../app/controllers/discovered_hosts_controller.rb:125
238
246
  msgid "Failed to reboot hosts with error %s"
239
247
  msgstr ""
240
248
 
241
- #: ../app/controllers/discovered_hosts_controller.rb:122
249
+ #: ../app/controllers/discovered_hosts_controller.rb:139
242
250
  msgid "Destroyed selected hosts"
243
251
  msgstr "消除所选主机"
244
252
 
245
- #: ../app/controllers/discovered_hosts_controller.rb:124
253
+ #: ../app/controllers/discovered_hosts_controller.rb:141
246
254
  msgid "The following hosts were not deleted: %s"
247
255
  msgstr "未删除以下主机:%s"
248
256
 
249
- #: ../app/controllers/discovered_hosts_controller.rb:151
257
+ #: ../app/controllers/discovered_hosts_controller.rb:168
250
258
  msgid "Failed to auto provision host %s: %s"
251
259
  msgstr "自动供应主机失败 %s:%s"
252
260
 
253
- #: ../app/controllers/discovered_hosts_controller.rb:179
261
+ #: ../app/controllers/discovered_hosts_controller.rb:196
254
262
  msgid "Discovered hosts are provisioning now"
255
263
  msgstr "已发现主机限制正在供应"
256
264
 
257
- #: ../app/controllers/discovered_hosts_controller.rb:267
265
+ #: ../app/controllers/discovered_hosts_controller.rb:225
266
+ msgid "Highlights"
267
+ msgstr ""
268
+
269
+ #: ../app/controllers/discovered_hosts_controller.rb:225
270
+ msgid "Storage"
271
+ msgstr ""
272
+
273
+ #: ../app/controllers/discovered_hosts_controller.rb:225
274
+ msgid "Hardware"
275
+ msgstr ""
276
+
277
+ #: ../app/controllers/discovered_hosts_controller.rb:225
278
+ msgid "Network"
279
+ msgstr ""
280
+
281
+ #: ../app/controllers/discovered_hosts_controller.rb:225
282
+ msgid "Software"
283
+ msgstr ""
284
+
285
+ #: ../app/controllers/discovered_hosts_controller.rb:225
286
+ msgid "IPMI"
287
+ msgstr ""
288
+
289
+ #: ../app/controllers/discovered_hosts_controller.rb:225
290
+ msgid "Miscellaneous"
291
+ msgstr ""
292
+
293
+ #: ../app/controllers/discovered_hosts_controller.rb:302
258
294
  msgid "No hosts were found with that id or name"
259
295
  msgstr "未找到符合此 id 或者名称的主机"
260
296
 
261
- #: ../app/controllers/discovered_hosts_controller.rb:271
297
+ #: ../app/controllers/discovered_hosts_controller.rb:306
262
298
  msgid "No hosts selected"
263
299
  msgstr "未选择任何主机"
264
300
 
265
- #: ../app/controllers/discovered_hosts_controller.rb:277
301
+ #: ../app/controllers/discovered_hosts_controller.rb:312
266
302
  msgid "Something went wrong while selecting hosts - %s"
267
303
  msgstr "选择主机时出错 - %s"
268
304
 
269
- #: ../app/controllers/discovery_rules_controller.rb:66
270
- msgid "Rule disabled"
271
- msgstr "已禁用规则"
272
-
273
305
  #: ../app/controllers/discovery_rules_controller.rb:66
274
306
  msgid "Rule enabled"
275
307
  msgstr "已启用规则"
276
308
 
277
- #: ../app/helpers/discovered_hosts_helper.rb:11
309
+ #: ../app/controllers/discovery_rules_controller.rb:66
310
+ msgid "Rule disabled"
311
+ msgstr "已禁用规则"
312
+
313
+ #: ../app/helpers/discovered_hosts_helper.rb:10
278
314
  msgid "%s ago"
279
315
  msgstr "%s 前"
280
316
 
281
- #: ../app/helpers/discovered_hosts_helper.rb:15
282
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42
317
+ #: ../app/helpers/discovered_hosts_helper.rb:14
318
+ #: ../app/helpers/discovered_hosts_helper.rb:94
283
319
  msgid "Provision"
284
320
  msgstr "供应"
285
321
 
286
- #: ../app/helpers/discovered_hosts_helper.rb:16
287
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
322
+ #: ../app/helpers/discovered_hosts_helper.rb:15
323
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:74
288
324
  msgid "Auto Provision"
289
325
  msgstr "自动供应"
290
326
 
291
- #: ../app/helpers/discovered_hosts_helper.rb:17
292
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:44
327
+ #: ../app/helpers/discovered_hosts_helper.rb:16
328
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:75
293
329
  msgid "Refresh facts"
294
330
  msgstr "刷新详情"
295
331
 
296
- #: ../app/helpers/discovered_hosts_helper.rb:18
297
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:45
332
+ #: ../app/helpers/discovered_hosts_helper.rb:17
333
+ #: ../app/models/setting/discovered.rb:23
334
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:76
298
335
  msgid "Reboot"
299
336
  msgstr "重启"
300
337
 
301
- #: ../app/helpers/discovered_hosts_helper.rb:21
338
+ #: ../app/helpers/discovered_hosts_helper.rb:20
302
339
  msgid "Back"
303
- msgstr ""
340
+ msgstr "后退"
304
341
 
305
- #: ../app/helpers/discovered_hosts_helper.rb:23
306
- #: ../app/helpers/discovered_hosts_helper.rb:46
342
+ #: ../app/helpers/discovered_hosts_helper.rb:22
343
+ #: ../app/helpers/discovered_hosts_helper.rb:39
307
344
  msgid "Select Action"
308
345
  msgstr "选择动作"
309
346
 
310
- #: ../app/helpers/discovered_hosts_helper.rb:30
347
+ #: ../app/helpers/discovered_hosts_helper.rb:24
311
348
  msgid "Expand All"
312
- msgstr ""
349
+ msgstr "展开全部"
313
350
 
314
- #: ../app/helpers/discovered_hosts_helper.rb:35
315
- msgid "Delete"
316
- msgstr "删除"
317
-
318
- #: ../app/helpers/discovered_hosts_helper.rb:36
319
- msgid "Are you sure?"
320
- msgstr "您确定吗?"
351
+ #: ../app/helpers/discovered_hosts_helper.rb:29
352
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:77
353
+ msgid "Delete %s?"
354
+ msgstr "删除 %s"
321
355
 
322
- #: ../app/helpers/discovered_hosts_helper.rb:42
356
+ #: ../app/helpers/discovered_hosts_helper.rb:35
323
357
  msgid "Delete hosts"
324
358
  msgstr "删除主机"
325
359
 
326
- #: ../app/helpers/discovered_hosts_helper.rb:43
360
+ #: ../app/helpers/discovered_hosts_helper.rb:36
327
361
  msgid "Assign Organization"
328
362
  msgstr "指定机构"
329
363
 
330
- #: ../app/helpers/discovered_hosts_helper.rb:44
364
+ #: ../app/helpers/discovered_hosts_helper.rb:37
331
365
  msgid "Assign Location"
332
366
  msgstr "指定位置"
333
367
 
334
- #: ../app/helpers/discovered_hosts_helper.rb:48
368
+ #: ../app/helpers/discovered_hosts_helper.rb:41
335
369
  msgid "%s - The following hosts are about to be changed"
336
370
  msgstr "%s - 要更改以下主机"
337
371
 
338
- #: ../app/helpers/discovered_hosts_helper.rb:57
372
+ #: ../app/helpers/discovered_hosts_helper.rb:50
339
373
  msgid "N/A"
340
374
  msgstr "无"
341
375
 
342
- #: ../app/helpers/discovered_hosts_helper.rb:69
376
+ #: ../app/helpers/discovered_hosts_helper.rb:62
343
377
  msgid "New in the last 24 hours"
344
378
  msgstr ""
345
379
 
346
- #: ../app/helpers/discovered_hosts_helper.rb:73
380
+ #: ../app/helpers/discovered_hosts_helper.rb:66
347
381
  msgid "Not reported in more than 7 days"
348
382
  msgstr ""
349
383
 
350
- #: ../app/helpers/discovered_hosts_helper.rb:77
384
+ #: ../app/helpers/discovered_hosts_helper.rb:70
351
385
  msgid "Reported in the last 7 days"
352
386
  msgstr ""
353
387
 
@@ -359,14 +393,14 @@ msgstr ""
359
393
  msgid "Associated Hosts"
360
394
  msgstr ""
361
395
 
362
- #: ../app/helpers/discovery_rules_helper.rb:29
363
- msgid "Disable rule '%s'?"
364
- msgstr ""
365
-
366
396
  #: ../app/helpers/discovery_rules_helper.rb:29
367
397
  msgid "Disable"
368
398
  msgstr "禁用"
369
399
 
400
+ #: ../app/helpers/discovery_rules_helper.rb:29
401
+ msgid "Disable rule '%s'?"
402
+ msgstr ""
403
+
370
404
  #: ../app/helpers/discovery_rules_helper.rb:31
371
405
  msgid "Enable"
372
406
  msgstr "启用"
@@ -395,52 +429,56 @@ msgstr "不能包含空白字段。"
395
429
  msgid "must start with a letter or ERB."
396
430
  msgstr "必须以字母或 ERB 开头。"
397
431
 
398
- #: ../app/models/discovery_rule.rb:49
432
+ #: ../app/models/discovery_rule.rb:47
399
433
  msgid ""
400
434
  "Host group organization %s must also be associated to the discovery rule"
401
435
  msgid_plural ""
402
436
  "Host group organizations %s must also be associated to the discovery rule"
403
437
  msgstr[0] ""
404
438
 
405
- #: ../app/models/discovery_rule.rb:55
439
+ #: ../app/models/discovery_rule.rb:53
406
440
  msgid "Host group location %s must also be associated to the discovery rule"
407
441
  msgid_plural ""
408
442
  "Host group locations %s must also be associated to the discovery rule"
409
443
  msgstr[0] ""
410
444
 
411
- #: ../app/models/host/discovered.rb:34
445
+ #: ../app/models/host/discovered.rb:35
412
446
  msgid "Invalid facts, must be a Hash"
413
447
  msgstr "无效详情,必须是 Hash"
414
448
 
415
- #: ../app/models/host/discovered.rb:39
449
+ #: ../app/models/host/discovered.rb:40
416
450
  msgid ""
417
451
  "Expected discovery_fact '%s' is missing, unable to detect primary interface "
418
452
  "and set hostname"
419
453
  msgstr ""
420
454
 
421
- #: ../app/models/host/discovered.rb:46
455
+ #: ../app/models/host/discovered.rb:47
422
456
  msgid ""
423
457
  "Invalid facts: hash does not contain a valid value for any of the facts in "
424
458
  "the discovery_hostname setting: %s"
425
459
  msgstr ""
426
460
 
427
- #: ../app/models/host/discovered.rb:107
461
+ #: ../app/models/host/discovered.rb:64
462
+ msgid "Facts could not be imported"
463
+ msgstr ""
464
+
465
+ #: ../app/models/host/discovered.rb:114
428
466
  msgid "Unable to assign subnet, primary interface is missing IP address"
429
467
  msgstr ""
430
468
 
431
- #: ../app/models/host/discovered.rb:149
469
+ #: ../app/models/host/discovered.rb:168
432
470
  msgid "Could not get facts from proxy %{url}: %{error}"
433
471
  msgstr "无法从代理服务器 %{url} 获取详情: %{error}"
434
472
 
435
- #: ../app/models/host/discovered.rb:165
473
+ #: ../app/models/host/discovered.rb:184
436
474
  msgid "Unable to reboot %{name} via %{url}: %{msg}"
437
475
  msgstr ""
438
476
 
439
- #: ../app/models/host/discovered.rb:173
477
+ #: ../app/models/host/discovered.rb:192
440
478
  msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
441
479
  msgstr ""
442
480
 
443
- #: ../app/models/host/discovered.rb:192
481
+ #: ../app/models/host/discovered.rb:211
444
482
  msgid "Invalid hostname: Could not normalize the hostname"
445
483
  msgstr ""
446
484
 
@@ -468,60 +506,138 @@ msgstr ""
468
506
  msgid "Fact name to use for primary interface detection"
469
507
  msgstr ""
470
508
 
509
+ #: ../app/models/setting/discovered.rb:19
510
+ msgid "Interface fact"
511
+ msgstr ""
512
+
471
513
  #: ../app/models/setting/discovered.rb:20
514
+ msgid "Clean all reported facts during provisioning (except discovery facts)"
515
+ msgstr ""
516
+
517
+ #: ../app/models/setting/discovered.rb:20
518
+ msgid "Clean all facts"
519
+ msgstr ""
520
+
521
+ #: ../app/models/setting/discovered.rb:21
472
522
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
473
523
  msgstr ""
474
524
 
475
525
  #: ../app/models/setting/discovered.rb:21
526
+ msgid "Hostname facts"
527
+ msgstr ""
528
+
529
+ #: ../app/models/setting/discovered.rb:22
476
530
  msgid ""
477
531
  "Automatically provision newly discovered hosts, according to the "
478
532
  "provisioning rules"
479
533
  msgstr "根据供应规则自动供应新发现的主机"
480
534
 
481
535
  #: ../app/models/setting/discovered.rb:22
482
- msgid "Automatically reboot discovered host during provisioning"
536
+ msgid "Auto provisioning"
483
537
  msgstr ""
484
538
 
485
- #: ../app/models/setting/discovered.rb:28
539
+ #: ../app/models/setting/discovered.rb:23
540
+ msgid "Automatically reboot or kexec discovered host during provisioning"
541
+ msgstr ""
542
+
543
+ #: ../app/models/setting/discovered.rb:24
486
544
  msgid "The default prefix to use for the host name, must start with a letter"
487
545
  msgstr "主机名使用的默认前缀,必须以字母开头。"
488
546
 
489
- #: ../app/models/setting/discovered.rb:34
547
+ #: ../app/models/setting/discovered.rb:24
548
+ msgid "Hostname prefix"
549
+ msgstr ""
550
+
551
+ #: ../app/models/setting/discovered.rb:25
490
552
  msgid "Extra facter columns to show in host lists (separate by comma)"
491
553
  msgstr ""
492
554
 
493
- #: ../app/models/setting/discovered.rb:41
494
- msgid "The default location to place discovered hosts in"
495
- msgstr "找到主机的默认位置"
555
+ #: ../app/models/setting/discovered.rb:25
556
+ msgid "Fact columns"
557
+ msgstr ""
496
558
 
497
- #: ../app/models/setting/discovered.rb:48
498
- msgid "The default organization to place discovered hosts in"
499
- msgstr "找到主机的默认机构"
559
+ #: ../app/models/setting/discovered.rb:26
560
+ msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
561
+ msgstr ""
500
562
 
501
- #: ../app/models/setting/discovered.rb:55
502
- msgid "Regex to organize facts for highlights section"
563
+ #: ../app/models/setting/discovered.rb:26
564
+ msgid "Highlighted facts"
503
565
  msgstr ""
504
566
 
505
- #: ../app/models/setting/discovered.rb:56
567
+ #: ../app/models/setting/discovered.rb:27
506
568
  msgid "Regex to organize facts for storage section"
507
569
  msgstr ""
508
570
 
509
- #: ../app/models/setting/discovered.rb:57
571
+ #: ../app/models/setting/discovered.rb:27
572
+ msgid "Storage facts"
573
+ msgstr ""
574
+
575
+ #: ../app/models/setting/discovered.rb:28
510
576
  msgid "Regex to organize facts for software section"
511
577
  msgstr ""
512
578
 
513
- #: ../app/models/setting/discovered.rb:58
579
+ #: ../app/models/setting/discovered.rb:28
580
+ msgid "Software facts"
581
+ msgstr ""
582
+
583
+ #: ../app/models/setting/discovered.rb:29
514
584
  msgid "Regex to organize facts for hardware section"
515
585
  msgstr ""
516
586
 
517
- #: ../app/models/setting/discovered.rb:59
587
+ #: ../app/models/setting/discovered.rb:29
588
+ msgid "Hardware facts"
589
+ msgstr ""
590
+
591
+ #: ../app/models/setting/discovered.rb:30
518
592
  msgid "Regex to organize facts for network section"
519
593
  msgstr ""
520
594
 
521
- #: ../app/models/setting/discovered.rb:60
595
+ #: ../app/models/setting/discovered.rb:30
596
+ msgid "Network facts"
597
+ msgstr ""
598
+
599
+ #: ../app/models/setting/discovered.rb:31
522
600
  msgid "Regex to organize facts for ipmi section"
523
601
  msgstr ""
524
602
 
603
+ #: ../app/models/setting/discovered.rb:31
604
+ msgid "IPMI facts"
605
+ msgstr ""
606
+
607
+ #: ../app/models/setting/discovered.rb:32
608
+ msgid ""
609
+ "Automatically generate PXE configuration to pin a newly discovered host to "
610
+ "discovery"
611
+ msgstr ""
612
+
613
+ #: ../app/models/setting/discovered.rb:32
614
+ msgid "Lock PXE"
615
+ msgstr ""
616
+
617
+ #: ../app/models/setting/discovered.rb:33
618
+ msgid "PXE template to be used when pinning a host to discovery"
619
+ msgstr ""
620
+
621
+ #: ../app/models/setting/discovered.rb:33
622
+ msgid "Locked template name"
623
+ msgstr ""
624
+
625
+ #: ../app/models/setting/discovered.rb:40
626
+ msgid "The default location to place discovered hosts in"
627
+ msgstr "找到主机的默认位置"
628
+
629
+ #: ../app/models/setting/discovered.rb:40
630
+ msgid "Discovery location"
631
+ msgstr ""
632
+
633
+ #: ../app/models/setting/discovered.rb:48
634
+ msgid "The default organization to place discovered hosts in"
635
+ msgstr "找到主机的默认机构"
636
+
637
+ #: ../app/models/setting/discovered.rb:48
638
+ msgid "Discovery organization"
639
+ msgstr ""
640
+
525
641
  #: ../app/services/foreman_discovery/fact_parser.rb:9
526
642
  msgid ""
527
643
  "Unable to detect primary interface using MAC '%{mac}' specified by "
@@ -567,18 +683,18 @@ msgid "Memory"
567
683
  msgstr "内存"
568
684
 
569
685
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
570
- #: ../lib/foreman_discovery/engine.rb:136
686
+ #: ../lib/foreman_discovery/engine.rb:147
571
687
  msgid "Discovered hosts"
572
688
  msgstr "找到的主机"
573
689
 
574
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
575
- msgid "items selected. Uncheck to Clear"
576
- msgstr "已选择项目。取消选择清除。"
577
-
578
690
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
579
691
  msgid "Select all items in this page"
580
692
  msgstr "选择本页中的所有项目"
581
693
 
694
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
695
+ msgid "items selected. Uncheck to Clear"
696
+ msgstr "已选择项目。取消选择清除。"
697
+
582
698
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
583
699
  #: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
584
700
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:17
@@ -622,19 +738,27 @@ msgstr "子网"
622
738
  msgid "Last facts upload"
623
739
  msgstr "最后一个上传的详情"
624
740
 
625
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
626
- msgid "Delete %s?"
627
- msgstr "删除 %s"
741
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
742
+ msgid "Select initial host properties"
743
+ msgstr ""
628
744
 
629
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
745
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:65
746
+ msgid "Quick create"
747
+ msgstr ""
748
+
749
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:66
750
+ msgid "Create host"
751
+ msgstr ""
752
+
753
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:88
630
754
  msgid "Please Confirm"
631
755
  msgstr "请确认"
632
756
 
633
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:63
757
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:94
634
758
  msgid "Cancel"
635
759
  msgstr "取消"
636
760
 
637
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:64
761
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:95
638
762
  msgid "Submit"
639
763
  msgstr "提交"
640
764
 
@@ -668,6 +792,10 @@ msgstr "选择机构"
668
792
  msgid "Discovered host: %s"
669
793
  msgstr "找到的主机:%s"
670
794
 
795
+ #: ../app/views/discovered_hosts/show.html.erb:24
796
+ msgid "Interfaces"
797
+ msgstr ""
798
+
671
799
  #: ../app/views/discovered_hosts/show.html.erb:32
672
800
  msgid "Identifier"
673
801
  msgstr "标示符"
@@ -731,41 +859,51 @@ msgid "Template"
731
859
  msgstr "模板"
732
860
 
733
861
  #: ../app/views/discovery_rules/_form.html.erb:26
734
- msgid ""
735
- "Specify target hostname template pattern in the same syntax as in "
736
- "Provisioning Templates (ERB)."
737
- msgstr "以与供应模板(ERB)相同的语法指定目标主机名模板模式。"
738
-
739
- #: ../app/views/discovery_rules/_form.html.erb:29
740
- msgid ""
741
- "Domain will be appended automatically. A hostname based on MAC address will "
742
- "be used when left blank. In addition to @host attribute function rand for "
743
- "random integers is available. Examples:"
744
- msgstr "将自动附加域。如为空白则会使用基于 MAC 地址的主机名。除 @host 属性外,还有用于随机整数的 rand 函数可用。例如:"
745
-
746
- #: ../app/views/discovery_rules/_form.html.erb:42
747
- msgid ""
748
- "When creating hostname patterns, make sure the resulting host names are "
749
- "unique. Hostnames must not start with numbers. A good approach is to use "
750
- "unique information provided by facter (MAC address, BIOS or serial ID)."
751
- msgstr "创建主机名模式时,请确保得到的主机名是唯一的。主机名不得以数字开头。可选择 facter 提供的特别信息(比如 MAC 地址,BIOS 或序列 ID)。"
752
-
753
- #: ../app/views/discovery_rules/_form.html.erb:43
754
862
  msgid "Hostname for provisioned hosts"
755
863
  msgstr "已供应主机的主机名"
756
864
 
757
- #: ../app/views/discovery_rules/_form.html.erb:44
865
+ #: ../app/views/discovery_rules/_form.html.erb:27
758
866
  msgid "Hosts limit"
759
867
  msgstr "主机限制"
760
868
 
761
- #: ../app/views/discovery_rules/_form.html.erb:44
869
+ #: ../app/views/discovery_rules/_form.html.erb:27
762
870
  msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
763
871
  msgstr "根据此规则可供应的最大主机数(0 代表无限)"
764
872
 
765
- #: ../app/views/discovery_rules/_form.html.erb:45
873
+ #: ../app/views/discovery_rules/_form.html.erb:28
766
874
  msgid "Rule priority (lower integer means higher priority)"
767
875
  msgstr "规则优先级(数字越小优先级越高)"
768
876
 
877
+ #: ../app/views/discovery_rules/_template_inline.erb:2
878
+ msgid ""
879
+ "Specify target hostname template pattern in the same syntax as in "
880
+ "Provisioning Templates (ERB)."
881
+ msgstr "以与供应模板(ERB)相同的语法指定目标主机名模板模式。"
882
+
883
+ #: ../app/views/discovery_rules/_template_inline.erb:4
884
+ msgid ""
885
+ "Domain will be appended automatically. A hostname based on MAC address will "
886
+ "be used when left blank."
887
+ msgstr ""
888
+
889
+ #: ../app/views/discovery_rules/_template_inline.erb:5
890
+ msgid ""
891
+ "In addition to @host attribute function rand for random integers is "
892
+ "available. Examples:"
893
+ msgstr ""
894
+
895
+ #: ../app/views/discovery_rules/_template_inline.erb:8
896
+ msgid ""
897
+ "When creating hostname patterns, make sure the resulting host names are "
898
+ "unique."
899
+ msgstr ""
900
+
901
+ #: ../app/views/discovery_rules/_template_inline.erb:9
902
+ msgid ""
903
+ "Hostnames must not start with numbers. A good approach is to use unique "
904
+ "information provided by facter (MAC address, BIOS or serial ID)."
905
+ msgstr ""
906
+
769
907
  #: ../app/views/discovery_rules/edit.html.erb:1
770
908
  msgid "Edit Discovery Rule"
771
909
  msgstr "编辑发现规则"
@@ -810,10 +948,10 @@ msgstr "新发现规则"
810
948
  msgid "A summary of discovered hosts"
811
949
  msgstr ""
812
950
 
813
- #: ../lib/foreman_discovery/engine.rb:141
951
+ #: ../lib/foreman_discovery/engine.rb:152
814
952
  msgid "Discovery rules"
815
953
  msgstr "发现规则"
816
954
 
817
- #: ../lib/foreman_discovery/engine.rb:146
955
+ #: ../lib/foreman_discovery/engine.rb:157
818
956
  msgid "Discovery widget"
819
957
  msgstr "发现小程序"