foreman_discovery 12.0.2 → 13.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/mailers/discovered_mailer.rb +12 -1
- data/app/models/host/discovered.rb +20 -7
- data/app/models/setting/discovered.rb +2 -0
- data/app/services/foreman_discovery/fact_parser.rb +8 -2
- data/app/services/foreman_discovery/lldp_neighbors.rb +104 -0
- data/app/views/discovery_rules/index.html.erb +1 -1
- data/extra/discovery/pxeless-vlan.json +217 -0
- data/lib/foreman_discovery/engine.rb +1 -1
- data/lib/foreman_discovery/version.rb +1 -1
- data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/ca/foreman_discovery.edit.po +143 -58
- data/locale/ca/foreman_discovery.po +4 -4
- data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/de/foreman_discovery.edit.po +145 -59
- data/locale/de/foreman_discovery.po +7 -7
- data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/en/foreman_discovery.edit.po +90 -58
- data/locale/en/foreman_discovery.po +28 -4
- data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/en_GB/foreman_discovery.edit.po +151 -66
- data/locale/en_GB/foreman_discovery.po +12 -12
- data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/es/foreman_discovery.edit.po +155 -70
- data/locale/es/foreman_discovery.po +16 -16
- data/locale/foreman_discovery.pot +93 -59
- data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/fr/foreman_discovery.edit.po +287 -200
- data/locale/fr/foreman_discovery.po +149 -148
- data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/gl/foreman_discovery.edit.po +144 -59
- data/locale/gl/foreman_discovery.po +5 -5
- data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/it/foreman_discovery.edit.po +144 -59
- data/locale/it/foreman_discovery.po +5 -5
- data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/ja/foreman_discovery.edit.po +153 -68
- data/locale/ja/foreman_discovery.po +16 -14
- data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/ko/foreman_discovery.edit.po +143 -59
- data/locale/ko/foreman_discovery.po +5 -5
- data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/pt_BR/foreman_discovery.edit.po +155 -70
- data/locale/pt_BR/foreman_discovery.po +16 -16
- data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/ru/foreman_discovery.edit.po +146 -63
- data/locale/ru/foreman_discovery.po +6 -6
- data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/sv_SE/foreman_discovery.edit.po +144 -59
- data/locale/sv_SE/foreman_discovery.po +5 -5
- data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/zh_CN/foreman_discovery.edit.po +150 -69
- data/locale/zh_CN/foreman_discovery.po +13 -15
- data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
- data/locale/zh_TW/foreman_discovery.edit.po +227 -144
- data/locale/zh_TW/foreman_discovery.po +88 -88
- data/test/functional/api/v2/discovery_rules_controller_test.rb +8 -0
- data/test/functional/api/v2/settings_controller_test.rb +2 -0
- data/test/test_helper_discovery.rb +2 -0
- data/test/unit/discovered_mailer_test.rb +14 -0
- data/test/unit/discovery_rule_test.rb +3 -0
- data/test/unit/facts_with_lldp.json +107 -0
- data/test/unit/facts_with_lldp_bond_candidate.json +107 -0
- data/test/unit/host_discovered_test.rb +72 -1
- data/test/unit/lldp_neighbors_test.rb +56 -0
- metadata +11 -2
@@ -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
|
11
|
+
"Project-Id-Version: foreman_discovery 13.0.0\n"
|
12
12
|
"Report-Msgid-Bugs-To: \n"
|
13
|
-
"PO-Revision-Date:
|
14
|
-
"Last-Translator:
|
13
|
+
"PO-Revision-Date: 2018-06-15 10:50+0000\n"
|
14
|
+
"Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>\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"
|
@@ -99,7 +99,7 @@ msgid "DHCP filename option (Grub2 or PXELinux by default)"
|
|
99
99
|
msgstr ""
|
100
100
|
|
101
101
|
msgid "Delete"
|
102
|
-
msgstr ""
|
102
|
+
msgstr "Radera"
|
103
103
|
|
104
104
|
msgid "Delete %s?"
|
105
105
|
msgstr "Radera %s?"
|
@@ -204,7 +204,7 @@ msgid "Domain will be appended automatically. A hostname based on MAC address wi
|
|
204
204
|
msgstr ""
|
205
205
|
|
206
206
|
msgid "Edit %s"
|
207
|
-
msgstr ""
|
207
|
+
msgstr "Redigera %s"
|
208
208
|
|
209
209
|
msgid "Enable"
|
210
210
|
msgstr ""
|
Binary file
|
@@ -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
|
8
|
+
"Project-Id-Version: foreman_discovery 13.0.0\n"
|
9
9
|
"Report-Msgid-Bugs-To: \n"
|
10
|
-
"
|
10
|
+
"POT-Creation-Date: 2018-06-15 11:25+0200\n"
|
11
|
+
"PO-Revision-Date: 2018-06-15 10:50+0000\n"
|
11
12
|
"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
|
12
|
-
"Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/
|
13
|
-
"age/zh_CN/)\n"
|
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"
|
16
16
|
"Content-Transfer-Encoding: 8bit\n"
|
@@ -21,19 +21,23 @@ msgstr ""
|
|
21
21
|
msgid "List all discovered hosts"
|
22
22
|
msgstr "列出所有发现主机"
|
23
23
|
|
24
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
|
24
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
|
25
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
|
25
26
|
msgid "filter results"
|
26
27
|
msgstr "过滤结果"
|
27
28
|
|
28
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
|
29
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
|
30
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
|
29
31
|
msgid "sort results"
|
30
32
|
msgstr "结果排序"
|
31
33
|
|
32
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
|
34
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
|
35
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
|
33
36
|
msgid "paginate results"
|
34
37
|
msgstr "编页结果"
|
35
38
|
|
36
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
|
39
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
|
40
|
+
#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
|
37
41
|
msgid "number of entries per request"
|
38
42
|
msgstr "每个请求中的条目数"
|
39
43
|
|
@@ -41,7 +45,8 @@ msgstr "每个请求中的条目数"
|
|
41
45
|
msgid "Show a discovered host"
|
42
46
|
msgstr "显示一个发现主机"
|
43
47
|
|
44
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
|
48
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
|
49
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
|
45
50
|
msgid "DHCP filename option (Grub2 or PXELinux by default)"
|
46
51
|
msgstr "DHCP 文件名选项(默认为 Grub2 或 PXELinux)"
|
47
52
|
|
@@ -62,11 +67,14 @@ msgid "not required if it's a virtual machine"
|
|
62
67
|
msgstr "如果是虚拟机,则不需要"
|
63
68
|
|
64
69
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
|
65
|
-
msgid "
|
70
|
+
msgid ""
|
71
|
+
"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
|
66
72
|
msgstr "用来跟踪业务流程任务状态的 UUID,GET /api/orchestration/:UUID/tasks"
|
67
73
|
|
68
74
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
|
69
|
-
msgid "
|
75
|
+
msgid ""
|
76
|
+
"required if value is not inherited from host group or default password in "
|
77
|
+
"settings"
|
70
78
|
msgstr "如果数值不是从主机组或设置中的默认密码继承,则需要。"
|
71
79
|
|
72
80
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
|
@@ -78,14 +86,18 @@ msgid "Upload facts for a host, creating the host if required"
|
|
78
86
|
msgstr "上传主机的系统详情,如需要,请创建主机。"
|
79
87
|
|
80
88
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
|
81
|
-
msgid "
|
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)"
|
82
93
|
msgstr "hash 包含具备最小详情集合的主机的详情:discovery_bootif、macaddress_eth0、ipaddress、ipaddress_eth0、interfaces: eth0(主接口名为 eth0 的示例)"
|
83
94
|
|
84
95
|
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
|
85
96
|
msgid "Execute rules against a discovered host"
|
86
97
|
msgstr "对发现主机执行规则"
|
87
98
|
|
88
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
|
99
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
|
100
|
+
#: ../app/controllers/discovered_hosts_controller.rb:159
|
89
101
|
msgid "Host %{host} was provisioned with rule %{rule}"
|
90
102
|
msgstr "主机 %{host} 置备了规则 %{rule}"
|
91
103
|
|
@@ -93,7 +105,8 @@ msgstr "主机 %{host} 置备了规则 %{rule}"
|
|
93
105
|
msgid "Unable to provision %{host}: %{errors}"
|
94
106
|
msgstr "无法置备 %{host}:%{errors}"
|
95
107
|
|
96
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
|
108
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
|
109
|
+
#: ../app/controllers/discovered_hosts_controller.rb:166
|
97
110
|
msgid "No rule found for host %s"
|
98
111
|
msgstr "没有为主机 %s 找到规则"
|
99
112
|
|
@@ -101,11 +114,13 @@ msgstr "没有为主机 %s 找到规则"
|
|
101
114
|
msgid "Execute rules against all currently discovered hosts"
|
102
115
|
msgstr "对当前所有发现主机执行规则"
|
103
116
|
|
104
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142
|
117
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142
|
118
|
+
#: ../app/controllers/discovered_hosts_controller.rb:172
|
105
119
|
msgid "Errors during auto provisioning: %s"
|
106
120
|
msgstr "自动置备期间出错:%s"
|
107
121
|
|
108
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
|
122
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
|
123
|
+
#: ../app/controllers/discovered_hosts_controller.rb:175
|
109
124
|
msgid "No discovered hosts to provision"
|
110
125
|
msgstr "没有要置备的发现主机"
|
111
126
|
|
@@ -125,7 +140,8 @@ msgstr "重启发现主机"
|
|
125
140
|
msgid "Rebooting all discovered hosts"
|
126
141
|
msgstr "重启所有发现主机"
|
127
142
|
|
128
|
-
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207
|
143
|
+
#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207
|
144
|
+
#: ../app/controllers/discovered_hosts_controller.rb:128
|
129
145
|
msgid "Discovered hosts are rebooting now"
|
130
146
|
msgstr "现在正在重启发现主机"
|
131
147
|
|
@@ -150,7 +166,8 @@ msgid "the hostgroup that is used to auto provision a host"
|
|
150
166
|
msgstr "用于自动置备主机的主机组"
|
151
167
|
|
152
168
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:35
|
153
|
-
msgid "
|
169
|
+
msgid ""
|
170
|
+
"defines a pattern to assign human-readable hostnames to the matching hosts"
|
154
171
|
msgstr "定义向匹配主机分配人类可读的主机名称的模式"
|
155
172
|
|
156
173
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:36
|
@@ -158,7 +175,8 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
|
|
158
175
|
msgstr "支持根据规则限制置备主机的最大数量"
|
159
176
|
|
160
177
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:37
|
161
|
-
msgid "
|
178
|
+
msgid ""
|
179
|
+
"puts the rules in order, low numbers go first. Must be greater then zero"
|
162
180
|
msgstr "按顺序排列规则,低数值优先。必须大于 0"
|
163
181
|
|
164
182
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:38
|
@@ -167,11 +185,11 @@ msgstr "标记用于临时关闭规则"
|
|
167
185
|
|
168
186
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:39
|
169
187
|
msgid "location ID for provisioned hosts"
|
170
|
-
msgstr ""
|
188
|
+
msgstr "预配主机的位置 ID"
|
171
189
|
|
172
190
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:40
|
173
191
|
msgid "organization ID for provisioned hosts"
|
174
|
-
msgstr ""
|
192
|
+
msgstr "预配主机的组织 ID"
|
175
193
|
|
176
194
|
#: ../app/controllers/api/v2/discovery_rules_controller.rb:44
|
177
195
|
msgid "Create a discovery rule"
|
@@ -309,15 +327,21 @@ msgstr "已禁用规则"
|
|
309
327
|
msgid "%s ago"
|
310
328
|
msgstr "%s 前"
|
311
329
|
|
312
|
-
#: ../app/helpers/discovered_hosts_helper.rb:14
|
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:46
|
313
333
|
msgid "Auto Provision"
|
314
334
|
msgstr "自动置备"
|
315
335
|
|
316
|
-
#: ../app/helpers/discovered_hosts_helper.rb:15
|
336
|
+
#: ../app/helpers/discovered_hosts_helper.rb:15
|
337
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
|
317
338
|
msgid "Refresh facts"
|
318
339
|
msgstr "刷新详情"
|
319
340
|
|
320
|
-
#: ../app/helpers/discovered_hosts_helper.rb:16
|
341
|
+
#: ../app/helpers/discovered_hosts_helper.rb:16
|
342
|
+
#: ../app/helpers/discovered_hosts_helper.rb:30
|
343
|
+
#: ../app/models/setting/discovered.rb:23
|
344
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
|
321
345
|
msgid "Reboot"
|
322
346
|
msgstr "重启"
|
323
347
|
|
@@ -325,11 +349,13 @@ msgstr "重启"
|
|
325
349
|
msgid "Back"
|
326
350
|
msgstr "后退"
|
327
351
|
|
328
|
-
#: ../app/helpers/discovered_hosts_helper.rb:21
|
352
|
+
#: ../app/helpers/discovered_hosts_helper.rb:21
|
353
|
+
#: ../app/helpers/discovered_hosts_helper.rb:35
|
329
354
|
msgid "Select Action"
|
330
355
|
msgstr "选择动作"
|
331
356
|
|
332
|
-
#: ../app/helpers/discovered_hosts_helper.rb:23
|
357
|
+
#: ../app/helpers/discovered_hosts_helper.rb:23
|
358
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
|
333
359
|
msgid "Delete %s?"
|
334
360
|
msgstr "删除 %s"
|
335
361
|
|
@@ -343,13 +369,14 @@ msgstr "指定位置"
|
|
343
369
|
|
344
370
|
#: ../app/helpers/discovered_hosts_helper.rb:33
|
345
371
|
msgid "Delete"
|
346
|
-
msgstr ""
|
372
|
+
msgstr "删除"
|
347
373
|
|
348
374
|
#: ../app/helpers/discovered_hosts_helper.rb:37
|
349
375
|
msgid "%s - The following hosts are about to be changed"
|
350
376
|
msgstr "%s - 要更改以下主机"
|
351
377
|
|
352
|
-
#: ../app/helpers/discovered_hosts_helper.rb:46
|
378
|
+
#: ../app/helpers/discovered_hosts_helper.rb:46
|
379
|
+
#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
|
353
380
|
msgid "N/A"
|
354
381
|
msgstr "N/A"
|
355
382
|
|
@@ -369,7 +396,11 @@ msgstr "最近 7 天内报告"
|
|
369
396
|
msgid "Provision"
|
370
397
|
msgstr "供应"
|
371
398
|
|
372
|
-
#: ../app/helpers/discovery_rules_helper.rb:26
|
399
|
+
#: ../app/helpers/discovery_rules_helper.rb:26
|
400
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
|
401
|
+
#: ../app/views/discovered_hosts/welcome.html.erb:1
|
402
|
+
#: ../app/views/discovered_hosts/welcome.html.erb:6
|
403
|
+
#: ../lib/foreman_discovery/engine.rb:173
|
373
404
|
msgid "Discovered Hosts"
|
374
405
|
msgstr "发现主机"
|
375
406
|
|
@@ -418,29 +449,32 @@ msgid "must be present."
|
|
418
449
|
msgstr ""
|
419
450
|
|
420
451
|
#: ../app/models/discovery_rule.rb:48
|
421
|
-
msgid "
|
422
|
-
|
452
|
+
msgid ""
|
453
|
+
"Host group organization %s must also be associated to the discovery rule"
|
454
|
+
msgid_plural ""
|
455
|
+
"Host group organizations %s must also be associated to the discovery rule"
|
423
456
|
msgstr[0] ""
|
424
|
-
"主机组机构 %s 也必须与发现规则关联\n"
|
425
|
-
"主机组机构 %s 也必须与发现规则关联"
|
426
457
|
|
427
458
|
#: ../app/models/discovery_rule.rb:54
|
428
459
|
msgid "Host group location %s must also be associated to the discovery rule"
|
429
|
-
msgid_plural "
|
460
|
+
msgid_plural ""
|
461
|
+
"Host group locations %s must also be associated to the discovery rule"
|
430
462
|
msgstr[0] ""
|
431
|
-
"主机组位置 %s 也必须与发现规则关联\n"
|
432
|
-
"主机组位置 %s 也必须与发现规则关联"
|
433
463
|
|
434
464
|
#: ../app/models/host/discovered.rb:51
|
435
465
|
msgid "Invalid facts, must be a Hash"
|
436
466
|
msgstr "无效详情,必须是 Hash"
|
437
467
|
|
438
468
|
#: ../app/models/host/discovered.rb:56
|
439
|
-
msgid "
|
469
|
+
msgid ""
|
470
|
+
"Expected discovery_fact '%s' is missing, unable to detect primary interface "
|
471
|
+
"and set hostname"
|
440
472
|
msgstr "期望的 discovery_fact '%s' 缺失,无法检测主接口和设置主机名称"
|
441
473
|
|
442
474
|
#: ../app/models/host/discovered.rb:63
|
443
|
-
msgid "
|
475
|
+
msgid ""
|
476
|
+
"Invalid facts: hash does not contain a valid value for any of the facts in "
|
477
|
+
"the discovery_hostname setting: %s"
|
444
478
|
msgstr "无效详情:hash 不包含 discovery_hostname 设置中任何详情的有效值:%s"
|
445
479
|
|
446
480
|
#: ../app/models/host/discovered.rb:89
|
@@ -512,7 +546,9 @@ msgid "Hostname facts"
|
|
512
546
|
msgstr "主机名详情"
|
513
547
|
|
514
548
|
#: ../app/models/setting/discovered.rb:22
|
515
|
-
msgid "
|
549
|
+
msgid ""
|
550
|
+
"Automatically provision newly discovered hosts, according to the "
|
551
|
+
"provisioning rules"
|
516
552
|
msgstr "根据置备规则,自动置备新发现主机"
|
517
553
|
|
518
554
|
#: ../app/models/setting/discovered.rb:22
|
@@ -588,7 +624,9 @@ msgid "IPMI facts"
|
|
588
624
|
msgstr "IPMI 详情"
|
589
625
|
|
590
626
|
#: ../app/models/setting/discovered.rb:32
|
591
|
-
msgid "
|
627
|
+
msgid ""
|
628
|
+
"Automatically generate PXE configuration to pin a newly discovered host to "
|
629
|
+
"discovery"
|
592
630
|
msgstr "自动生成 PXE 配置,以将新发现主机固定至发现"
|
593
631
|
|
594
632
|
#: ../app/models/setting/discovered.rb:32
|
@@ -628,7 +666,9 @@ msgid "Force DNS"
|
|
628
666
|
msgstr "强制 DNS"
|
629
667
|
|
630
668
|
#: ../app/models/setting/discovered.rb:37
|
631
|
-
msgid "
|
669
|
+
msgid ""
|
670
|
+
"Do not allow to discover existing managed host matching MAC of a "
|
671
|
+
"provisioning NIC (errors out early)"
|
632
672
|
msgstr ""
|
633
673
|
|
634
674
|
#: ../app/models/setting/discovered.rb:37
|
@@ -660,7 +700,9 @@ msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
|
|
660
700
|
msgstr ""
|
661
701
|
|
662
702
|
#: ../app/services/foreman_discovery/fact_parser.rb:12
|
663
|
-
msgid "
|
703
|
+
msgid ""
|
704
|
+
"Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: "
|
705
|
+
"%{filter}"
|
664
706
|
msgstr ""
|
665
707
|
|
666
708
|
#: ../app/services/foreman_discovery/node_api/node_resource.rb:75
|
@@ -679,21 +721,31 @@ msgstr "没有可用的发现主机"
|
|
679
721
|
msgid "Host"
|
680
722
|
msgstr "主机"
|
681
723
|
|
682
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
|
724
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
|
725
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
|
726
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
|
727
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:18
|
728
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:10
|
683
729
|
msgid "Model"
|
684
730
|
msgstr "型号"
|
685
731
|
|
686
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
|
732
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
|
733
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
|
734
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:20
|
735
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:12
|
687
736
|
msgid "CPUs"
|
688
737
|
msgstr "CPU"
|
689
738
|
|
690
|
-
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
|
739
|
+
#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
|
740
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
|
741
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:21
|
742
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:13
|
691
743
|
msgid "Memory"
|
692
744
|
msgstr "内存"
|
693
745
|
|
694
746
|
#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
|
695
747
|
msgid "Customize Host"
|
696
|
-
msgstr ""
|
748
|
+
msgstr "自定义主机"
|
697
749
|
|
698
750
|
#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
|
699
751
|
msgid "Create Host"
|
@@ -707,11 +759,16 @@ msgstr "选择本页中的所有项目"
|
|
707
759
|
msgid "items selected. Uncheck to Clear"
|
708
760
|
msgstr "已选择项目。取消选择清除。"
|
709
761
|
|
710
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
|
762
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
|
763
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
|
764
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:17
|
765
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:9
|
711
766
|
msgid "Name"
|
712
767
|
msgstr "名称"
|
713
768
|
|
714
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
|
769
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
|
770
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:19
|
771
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:11
|
715
772
|
msgid "IP Address"
|
716
773
|
msgstr "IP 地址"
|
717
774
|
|
@@ -723,11 +780,13 @@ msgstr "磁盘计数"
|
|
723
780
|
msgid "Disks Size"
|
724
781
|
msgstr "磁盘大小"
|
725
782
|
|
726
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
|
783
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
|
784
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
|
727
785
|
msgid "Location"
|
728
786
|
msgstr "位置"
|
729
787
|
|
730
|
-
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
|
788
|
+
#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
|
789
|
+
#: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
|
731
790
|
msgid "Organization"
|
732
791
|
msgstr "机构"
|
733
792
|
|
@@ -756,7 +815,9 @@ msgid "Provision %s"
|
|
756
815
|
msgstr "置备 %s"
|
757
816
|
|
758
817
|
#: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
|
759
|
-
msgid "
|
818
|
+
msgid ""
|
819
|
+
"This might take a while, as all hosts, facts and reports will be destroyed "
|
820
|
+
"as well"
|
760
821
|
msgstr "这需要一些时间,因为同时还要删除所有主机、详情及报告。"
|
761
822
|
|
762
823
|
#: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
|
@@ -793,19 +854,21 @@ msgstr "IP 地址"
|
|
793
854
|
|
794
855
|
#: ../app/views/discovered_hosts/show.html.erb:66
|
795
856
|
msgid "Collapse All"
|
796
|
-
msgstr ""
|
857
|
+
msgstr "隐藏全部"
|
797
858
|
|
798
859
|
#: ../app/views/discovered_hosts/welcome.html.erb:7
|
799
860
|
msgid "No discovered hosts found in this context."
|
800
|
-
msgstr ""
|
861
|
+
msgstr "在此上下文中未找到发现主机。"
|
801
862
|
|
802
863
|
#: ../app/views/discovered_hosts/welcome.html.erb:8
|
803
|
-
msgid "
|
804
|
-
|
864
|
+
msgid ""
|
865
|
+
"This page shows discovered bare-metal or virtual nodes waiting to be "
|
866
|
+
"provisioned."
|
867
|
+
msgstr "此页显示了等待置备的发现裸机或虚拟节点。"
|
805
868
|
|
806
869
|
#: ../app/views/discovered_hosts/welcome.html.erb:9
|
807
870
|
msgid "Learn more about this in the documentation."
|
808
|
-
msgstr ""
|
871
|
+
msgstr "在本文档中了解更多这方面的内容。"
|
809
872
|
|
810
873
|
#: ../app/views/discovered_mailer/discovered_summary.html.erb:6
|
811
874
|
msgid "Summary report for discovered hosts from Foreman"
|
@@ -815,19 +878,23 @@ msgstr "来自 Foreman 的 发现主机概述报告"
|
|
815
878
|
msgid "<b>Foreman</b> Discovered hosts summary"
|
816
879
|
msgstr "<b>Foreman</b> 发现主机概述"
|
817
880
|
|
818
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
|
881
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
|
882
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
|
819
883
|
msgid "Summary from %{time} ago to %{now}"
|
820
884
|
msgstr "从 %{time} 前到 %{now} 的概述"
|
821
885
|
|
822
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
|
886
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
|
887
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
|
823
888
|
msgid "Discovered hosts from Foreman server at %{foreman_url}"
|
824
889
|
msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
|
825
890
|
|
826
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
|
891
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
|
892
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
|
827
893
|
msgid "Disk count"
|
828
894
|
msgstr "磁盘计数"
|
829
895
|
|
830
|
-
#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
|
896
|
+
#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
|
897
|
+
#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
|
831
898
|
msgid "Disks size"
|
832
899
|
msgstr "磁盘大小"
|
833
900
|
|
@@ -876,28 +943,38 @@ msgid "Rule priority (lower integer means higher priority)"
|
|
876
943
|
msgstr "规则优先级(整数越小,优先级越高)"
|
877
944
|
|
878
945
|
#: ../app/views/discovery_rules/_template_inline.erb:2
|
879
|
-
msgid "
|
946
|
+
msgid ""
|
947
|
+
"Specify target hostname template pattern in the same syntax as in "
|
948
|
+
"Provisioning Templates (ERB)."
|
880
949
|
msgstr "以与置备模板 (ERB) 中相同的语法指定目标主机名模板模式。"
|
881
950
|
|
882
951
|
#: ../app/views/discovery_rules/_template_inline.erb:4
|
883
|
-
msgid "
|
952
|
+
msgid ""
|
953
|
+
"Domain will be appended automatically. A hostname based on MAC address will "
|
954
|
+
"be used when left blank."
|
884
955
|
msgstr "域将自动附加。留空时将使用基于 MAC 地址的主机名。"
|
885
956
|
|
886
957
|
#: ../app/views/discovery_rules/_template_inline.erb:5
|
887
|
-
msgid "
|
958
|
+
msgid ""
|
959
|
+
"In addition to @host attribute function rand for random integers is "
|
960
|
+
"available. Examples:"
|
888
961
|
msgstr "除了 @host 属性函数之外,还提供随机整数 rand。"
|
889
962
|
|
890
963
|
#: ../app/views/discovery_rules/_template_inline.erb:8
|
891
|
-
msgid "
|
964
|
+
msgid ""
|
965
|
+
"When creating hostname patterns, make sure the resulting host names are "
|
966
|
+
"unique."
|
892
967
|
msgstr "创建主机名模式时,确保生成的主机名是唯一的。"
|
893
968
|
|
894
969
|
#: ../app/views/discovery_rules/_template_inline.erb:9
|
895
|
-
msgid "
|
970
|
+
msgid ""
|
971
|
+
"Hostnames must not start with numbers. A good approach is to use unique "
|
972
|
+
"information provided by facter (MAC address, BIOS or serial ID)."
|
896
973
|
msgstr "主机名不得以数字开始。一种好方法是使用 facter 提供的独特信息(MAC 地址、BIOS 或序列 ID)。"
|
897
974
|
|
898
975
|
#: ../app/views/discovery_rules/edit.html.erb:1
|
899
976
|
msgid "Edit %s"
|
900
|
-
msgstr ""
|
977
|
+
msgstr "编辑 %s"
|
901
978
|
|
902
979
|
#: ../app/views/discovery_rules/index.html.erb:1
|
903
980
|
msgid "Discovery Rules"
|
@@ -968,9 +1045,13 @@ msgid "Discovery Proxy"
|
|
968
1045
|
msgstr "发现代理服务器"
|
969
1046
|
|
970
1047
|
#: ../lib/foreman_discovery/engine.rb:189
|
971
|
-
msgid "
|
1048
|
+
msgid ""
|
1049
|
+
"Discovery Proxy to use within this subnet for managing connection to "
|
1050
|
+
"discovered hosts"
|
972
1051
|
msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
|
973
1052
|
|
974
1053
|
#: ../lib/foreman_discovery/engine.rb:190
|
975
|
-
msgid "
|
1054
|
+
msgid ""
|
1055
|
+
"ID of Discovery Proxy to use within this subnet for managing connection to "
|
1056
|
+
"discovered hosts"
|
976
1057
|
msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
|