foreman_discovery 16.3.5 → 17.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +1 -0
  3. data/app/controllers/discovered_hosts_controller.rb +24 -35
  4. data/app/controllers/discovery_rules_controller.rb +12 -1
  5. data/app/helpers/discovered_hosts_helper.rb +1 -1
  6. data/app/helpers/discovery_rules_helper.rb +1 -0
  7. data/app/models/discovery_rule.rb +10 -5
  8. data/app/services/foreman_discovery/fact_to_category_resolver.rb +106 -0
  9. data/app/services/foreman_discovery/ui_notifications/failed_discovery.rb +34 -0
  10. data/app/services/foreman_discovery/ui_notifications/new_host.rb +2 -1
  11. data/app/views/discovered_hosts/_discovered_hosts_list.html.erb +44 -40
  12. data/app/views/discovery_rules/clone.erb +3 -0
  13. data/app/views/discovery_rules/index.html.erb +4 -0
  14. data/app/views/discovery_rules/welcome.html.erb +15 -0
  15. data/app/views/foreman_discovery/debian_kexec.erb +1 -1
  16. data/app/views/foreman_discovery/redhat_kexec.erb +1 -1
  17. data/config/routes.rb +2 -0
  18. data/db/seeds.d/80_discovery_ui_notification.rb +11 -5
  19. data/lib/foreman_discovery/engine.rb +3 -7
  20. data/lib/foreman_discovery/version.rb +1 -1
  21. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  22. data/locale/ca/foreman_discovery.edit.po +103 -70
  23. data/locale/ca/foreman_discovery.po +36 -9
  24. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  25. data/locale/de/foreman_discovery.edit.po +109 -76
  26. data/locale/de/foreman_discovery.po +45 -18
  27. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  28. data/locale/en/foreman_discovery.edit.po +98 -66
  29. data/locale/en/foreman_discovery.po +31 -4
  30. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  31. data/locale/en_GB/foreman_discovery.edit.po +107 -74
  32. data/locale/en_GB/foreman_discovery.po +36 -9
  33. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  34. data/locale/es/foreman_discovery.edit.po +109 -76
  35. data/locale/es/foreman_discovery.po +70 -41
  36. data/locale/foreman_discovery.pot +142 -97
  37. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  38. data/locale/fr/foreman_discovery.edit.po +151 -118
  39. data/locale/fr/foreman_discovery.po +76 -49
  40. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  41. data/locale/gl/foreman_discovery.edit.po +101 -68
  42. data/locale/gl/foreman_discovery.po +32 -5
  43. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  44. data/locale/it/foreman_discovery.edit.po +107 -74
  45. data/locale/it/foreman_discovery.po +44 -17
  46. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  47. data/locale/ja/foreman_discovery.edit.po +136 -103
  48. data/locale/ja/foreman_discovery.po +79 -54
  49. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  50. data/locale/ko/foreman_discovery.edit.po +107 -74
  51. data/locale/ko/foreman_discovery.po +43 -16
  52. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  53. data/locale/pt_BR/foreman_discovery.edit.po +109 -76
  54. data/locale/pt_BR/foreman_discovery.po +69 -39
  55. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  56. data/locale/ru/foreman_discovery.edit.po +112 -79
  57. data/locale/ru/foreman_discovery.po +43 -16
  58. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  59. data/locale/sv_SE/foreman_discovery.edit.po +101 -68
  60. data/locale/sv_SE/foreman_discovery.po +34 -7
  61. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  62. data/locale/zh_CN/foreman_discovery.edit.po +153 -120
  63. data/locale/zh_CN/foreman_discovery.po +114 -90
  64. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  65. data/locale/zh_TW/foreman_discovery.edit.po +107 -74
  66. data/locale/zh_TW/foreman_discovery.po +43 -16
  67. data/package.json +6 -6
  68. data/test/functional/api/v2/discovered_hosts_controller_test.rb +9 -0
  69. data/test/functional/discovery_rules_controller_test.rb +6 -1
  70. data/test/integration/discovered_hosts_test.rb +53 -5
  71. data/test/test_helper_discovery.rb +5 -0
  72. data/test/unit/discovery_rule_test.rb +24 -2
  73. data/test/unit/fact_to_category_resolver_test.rb +41 -0
  74. data/test/unit/ui_notifications/destroy_host_test.rb +2 -9
  75. data/test/unit/ui_notifications/new_host_test.rb +3 -3
  76. data/webpack/__mocks__/foremanReact/common/I18n.js +3 -0
  77. data/webpack/__mocks__/foremanReact/common/helpers.js +1 -0
  78. data/webpack/__mocks__/foremanReact/common/index.js +5 -0
  79. data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js +69 -0
  80. data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js +77 -0
  81. data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js +29 -0
  82. data/webpack/__mocks__/foremanReact/components/common/EmptyState/index.js +5 -0
  83. data/webpack/index.js +9 -8
  84. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js +7 -7
  85. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js +12 -0
  86. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap +16 -0
  87. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js +1 -1
  88. data/webpack/src/ForemanDiscovery/DiscoveredHosts/index.js +3 -3
  89. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js +34 -0
  90. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/index.js +1 -0
  91. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js +19 -0
  92. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap +22 -0
  93. data/webpack/src/ForemanDiscovery/DiscoveryRules/index.js +6 -0
  94. data/webpack/src/reducers.js +0 -2
  95. metadata +32 -10
@@ -5,9 +5,10 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_discovery 16.3.4\n"
8
+ "Project-Id-Version: foreman_discovery 17.1.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "PO-Revision-Date: 2020-12-01 08:28+0000\n"
10
+ "POT-Creation-Date: 2021-09-20 17:25+0200\n"
11
+ "PO-Revision-Date: 2021-05-18 15:01+0000\n"
11
12
  "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
12
13
  "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
13
14
  "age/zh_CN/)\n"
@@ -19,7 +20,7 @@ msgstr ""
19
20
 
20
21
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:16
21
22
  msgid "List all discovered hosts"
22
- msgstr "列出所有发现主机"
23
+ msgstr "列出所有发现的主机"
23
24
 
24
25
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
25
26
  msgid "filter results"
@@ -27,15 +28,15 @@ msgstr "过滤结果"
27
28
 
28
29
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
29
30
  msgid "sort results"
30
- msgstr "排序結果"
31
+ msgstr "排序结果"
31
32
 
32
33
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
33
34
  msgid "paginate results"
34
- msgstr "編頁結果"
35
+ msgstr "分页结果"
35
36
 
36
37
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
37
38
  msgid "number of entries per request"
38
- msgstr "每個請求的項目數量"
39
+ msgstr "每个请求的条目数"
39
40
 
40
41
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:26
41
42
  msgid "Show a discovered host"
@@ -55,11 +56,11 @@ msgstr "置备发现主机"
55
56
 
56
57
  #: ../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
58
  msgid "required if host is managed and value is not inherited from host group"
58
- msgstr "若主機是個受管理的主機,並且值不是由主機群組所繼承的話便需要"
59
+ msgstr "如果主机是受管的,值没有从主机组继承时需要"
59
60
 
60
61
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
61
62
  msgid "not required if using a subnet with DHCP proxy"
62
- msgstr "若是使用一個含有 DHCP 協定的子網路則不需要"
63
+ msgstr "如果使用带有 DHCP 代理的子网则不需要"
63
64
 
64
65
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:56
65
66
  msgid "not required if it's a virtual machine"
@@ -67,7 +68,7 @@ msgstr "如果是虚拟机,则不需要"
67
68
 
68
69
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
69
70
  msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
70
- msgstr "若不是基於映像檔的佈建,而主機受管理並且值並非由主機群組所繼承的話便需要"
71
+ msgstr "如果不是基于置备镜像,主机是受管的,值没有从主机组继承时需要"
71
72
 
72
73
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
73
74
  msgid "required if host is managed and custom partition has not been defined"
@@ -75,7 +76,7 @@ msgstr "如果已管理主机,且未定义自定义分区,则需填写。"
75
76
 
76
77
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
77
78
  msgid "Host's owner type"
78
- msgstr "主机拥有者类型"
79
+ msgstr "主机所有者类型"
79
80
 
80
81
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
81
82
  msgid "Host's parameters (array or indexed hash)"
@@ -83,7 +84,7 @@ msgstr "主机参数(阵列或索引哈希)"
83
84
 
84
85
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
85
86
  msgid "Name of the parameter"
86
- msgstr "參數名稱"
87
+ msgstr "参数名"
87
88
 
88
89
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
89
90
  msgid "Parameter value"
@@ -95,7 +96,7 @@ msgstr "值类型"
95
96
 
96
97
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
97
98
  msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
98
- msgstr "用來追蹤協調流程任務狀態的 UUID,GET /api/orchestration/:UUID/tasks"
99
+ msgstr "用于跟踪编配任务状态的 UUID,GET /api/orchestration/:UUID/tasks"
99
100
 
100
101
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
101
102
  msgid "required if value is not inherited from host group or default password in settings"
@@ -107,57 +108,57 @@ msgstr "删除发现主机"
107
108
 
108
109
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
109
110
  msgid "Upload facts for a host, creating the host if required"
110
- msgstr "上傳主機的詳情,並視需求建立主機"
111
+ msgstr "上载主机的事实,并根据需要创建主机"
111
112
 
112
113
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
113
114
  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)"
114
115
  msgstr "hash 包含具备最小详情集合的主机的详情:discovery_bootif、macaddress_eth0、ipaddress、ipaddress_eth0、interfaces: eth0(主接口名为 eth0 的示例)"
115
116
 
116
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:129
117
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:130
117
118
  msgid "Execute rules against a discovered host"
118
119
  msgstr "对发现主机执行规则"
119
120
 
120
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:135 ../app/controllers/discovered_hosts_controller.rb:160
121
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:160
121
122
  msgid "Host %{host} was provisioned with rule %{rule}"
122
123
  msgstr "主机 %{host} 被置备,带有规则 %{rule}"
123
124
 
124
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
125
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:139
125
126
  msgid "Unable to provision %{host}: %{errors}"
126
127
  msgstr "无法置备 %{host}:%{errors}"
127
128
 
128
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:144 ../app/controllers/discovered_hosts_controller.rb:167
129
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:167
129
130
  msgid "No rule found for host %s"
130
131
  msgstr "没有为主机 %s 找到规则"
131
132
 
132
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:151
133
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:152
133
134
  msgid "Execute rules against all currently discovered hosts"
134
135
  msgstr "对当前所有发现主机执行规则"
135
136
 
136
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:155 ../app/controllers/discovered_hosts_controller.rb:173
137
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:173
137
138
  msgid "Errors during auto provisioning: %s"
138
139
  msgstr "自动置备期间出错:%s"
139
140
 
140
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:158 ../app/controllers/discovered_hosts_controller.rb:176
141
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:176
141
142
  msgid "No discovered hosts to provision"
142
143
  msgstr "没有要置备的发现主机"
143
144
 
144
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
145
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:181
145
146
  msgid "%s discovered hosts were provisioned"
146
147
  msgstr "%s 发现的主机被置备"
147
148
 
148
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
149
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:192
149
150
  msgid "Refreshing the facts of a discovered host"
150
151
  msgstr "刷新发现主机的详情"
151
152
 
152
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
153
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:201
153
154
  msgid "Rebooting a discovered host"
154
155
  msgstr "重启发现主机"
155
156
 
156
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:209
157
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:210
157
158
  msgid "Rebooting all discovered hosts"
158
159
  msgstr "重启所有发现主机"
159
160
 
160
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:220 ../app/controllers/discovered_hosts_controller.rb:129
161
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:129
161
162
  msgid "Discovered hosts are rebooting now"
162
163
  msgstr "现在正在重启发现主机"
163
164
 
@@ -275,7 +276,7 @@ msgstr "无法重启主机,错误 %s"
275
276
 
276
277
  #: ../app/controllers/discovered_hosts_controller.rb:150
277
278
  msgid "Destroyed selected hosts"
278
- msgstr "刪除選擇的主機"
279
+ msgstr "销毁选定的主机"
279
280
 
280
281
  #: ../app/controllers/discovered_hosts_controller.rb:152
281
282
  msgid "The following hosts were not deleted: %s"
@@ -289,65 +290,41 @@ msgstr "无法自动置备主机 %s:%s"
289
290
  msgid "Discovered hosts are provisioning now"
290
291
  msgstr "现在发现主机正在置备"
291
292
 
292
- #: ../app/controllers/discovered_hosts_controller.rb:226
293
- msgid "Highlights"
294
- msgstr "亮点"
295
-
296
- #: ../app/controllers/discovered_hosts_controller.rb:226
297
- msgid "Storage"
298
- msgstr "存储"
299
-
300
- #: ../app/controllers/discovered_hosts_controller.rb:226
301
- msgid "Hardware"
302
- msgstr "硬件"
303
-
304
- #: ../app/controllers/discovered_hosts_controller.rb:226
305
- msgid "Network"
306
- msgstr "网络"
307
-
308
- #: ../app/controllers/discovered_hosts_controller.rb:226
309
- msgid "Software"
310
- msgstr "软件"
311
-
312
- #: ../app/controllers/discovered_hosts_controller.rb:226
313
- msgid "IPMI"
314
- msgstr "IPMI"
293
+ #: ../app/controllers/discovered_hosts_controller.rb:277
294
+ msgid "Discovered host reported from unknown subnet, communication will not be proxied."
295
+ msgstr "从未知子网报告发现的主机,通信数据将不会被代理。"
315
296
 
316
- #: ../app/controllers/discovered_hosts_controller.rb:226
317
- msgid "Miscellaneous"
318
- msgstr "杂项"
297
+ #: ../app/controllers/discovered_hosts_controller.rb:282
298
+ msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
299
+ msgstr "从未知子网报告发现的主机为 %s,通信数据将不会被代理。"
319
300
 
320
- #: ../app/controllers/discovered_hosts_controller.rb:304
301
+ #: ../app/controllers/discovered_hosts_controller.rb:296
321
302
  msgid "No hosts were found with that id or name"
322
- msgstr "沒有找到擁有此 ID 或名稱的主機"
303
+ msgstr "找不到具有该 ID 或名称的主机"
323
304
 
324
- #: ../app/controllers/discovered_hosts_controller.rb:308
305
+ #: ../app/controllers/discovered_hosts_controller.rb:300
325
306
  msgid "No hosts selected"
326
- msgstr "未選擇主機"
307
+ msgstr "未选择主机"
327
308
 
328
- #: ../app/controllers/discovered_hosts_controller.rb:314
309
+ #: ../app/controllers/discovered_hosts_controller.rb:306
329
310
  msgid "Something went wrong while selecting hosts - %s"
330
311
  msgstr "选择主机时出错 - %s"
331
312
 
332
- #: ../app/controllers/discovery_rules_controller.rb:72
313
+ #: ../app/controllers/discovery_rules_controller.rb:79
333
314
  msgid "Rule enabled"
334
315
  msgstr "已启用规则"
335
316
 
336
- #: ../app/controllers/discovery_rules_controller.rb:72
317
+ #: ../app/controllers/discovery_rules_controller.rb:79
337
318
  msgid "Rule disabled"
338
319
  msgstr "已禁用规则"
339
320
 
340
- #: ../app/helpers/discovered_hosts_helper.rb:10
341
- msgid "%s ago"
342
- msgstr "%s 前"
343
-
344
321
  #: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
345
322
  msgid "Auto Provision"
346
323
  msgstr "自动置备"
347
324
 
348
325
  #: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
349
326
  msgid "Refresh facts"
350
- msgstr "刷新詳情"
327
+ msgstr "刷新详情"
351
328
 
352
329
  #: ../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:42
353
330
  msgid "Reboot"
@@ -359,7 +336,7 @@ msgstr "返回"
359
336
 
360
337
  #: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
361
338
  msgid "Select Action"
362
- msgstr "選擇動作"
339
+ msgstr "选择操作"
363
340
 
364
341
  #: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
365
342
  msgid "Delete %s?"
@@ -367,11 +344,11 @@ msgstr "刪除 %s?"
367
344
 
368
345
  #: ../app/helpers/discovered_hosts_helper.rb:31
369
346
  msgid "Assign Organization"
370
- msgstr "指定組織"
347
+ msgstr "分配机构"
371
348
 
372
349
  #: ../app/helpers/discovered_hosts_helper.rb:32
373
350
  msgid "Assign Location"
374
- msgstr "指定位置"
351
+ msgstr "分配位置"
375
352
 
376
353
  #: ../app/helpers/discovered_hosts_helper.rb:33
377
354
  msgid "Delete"
@@ -383,7 +360,7 @@ msgstr "%s - 以下主机即将更改"
383
360
 
384
361
  #: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
385
362
  msgid "N/A"
386
- msgstr "N / A"
363
+ msgstr "不适用"
387
364
 
388
365
  #: ../app/helpers/discovered_hosts_helper.rb:58
389
366
  msgid "New in the last 24 hours"
@@ -426,6 +403,10 @@ msgid "Enable rule '%s'?"
426
403
  msgstr "启用规则 '%s'?"
427
404
 
428
405
  #: ../app/helpers/discovery_rules_helper.rb:33
406
+ msgid "Clone"
407
+ msgstr "克隆"
408
+
409
+ #: ../app/helpers/discovery_rules_helper.rb:34
429
410
  msgid "Delete rule '%s'?"
430
411
  msgstr "删除规则 '%s'?"
431
412
 
@@ -449,12 +430,12 @@ msgstr "必须以字母或 ERB 开始。"
449
430
  msgid "must be present."
450
431
  msgstr "必须存在。"
451
432
 
452
- #: ../app/models/discovery_rule.rb:52
433
+ #: ../app/models/discovery_rule.rb:57
453
434
  msgid "Host group organization %s must also be associated to the discovery rule"
454
435
  msgid_plural "Host group organizations %s must also be associated to the discovery rule"
455
436
  msgstr[0] "主机组机构 %s 也必须与发现规则关联"
456
437
 
457
- #: ../app/models/discovery_rule.rb:56
438
+ #: ../app/models/discovery_rule.rb:61
458
439
  msgid "Host group location %s must also be associated to the discovery rule"
459
440
  msgid_plural "Host group locations %s must also be associated to the discovery rule"
460
441
  msgstr[0] "主机组位置 %s 也必须与发现规则关联"
@@ -487,23 +468,23 @@ msgstr "无效详情:hash 不包含 discovery_hostname 设置中任何详情
487
468
  msgid "Facts could not be imported"
488
469
  msgstr "无法导入详情"
489
470
 
490
- #: ../app/models/host/discovered.rb:146
471
+ #: ../app/models/host/discovered.rb:155
491
472
  msgid "Could not get facts from proxy %{url}: %{error}"
492
473
  msgstr "无法从代理 %{url} 获得详情:%{error}"
493
474
 
494
- #: ../app/models/host/discovered.rb:160
475
+ #: ../app/models/host/discovered.rb:173
495
476
  msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
496
477
  msgstr "无法在%{name}(%{url})上执行重新引导:%{msg}"
497
478
 
498
- #: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
479
+ #: ../app/models/host/discovered.rb:177 ../app/models/host/discovered.rb:200
499
480
  msgid "Unable to perform %{action} on %{ips}"
500
481
  msgstr "无法在 %{ips} 上执行 %{action}"
501
482
 
502
- #: ../app/models/host/discovered.rb:179
483
+ #: ../app/models/host/discovered.rb:196
503
484
  msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
504
485
  msgstr "无法在 %{name} (%{url}) 上执行 kexec : %{msg}"
505
486
 
506
- #: ../app/models/host/discovered.rb:203
487
+ #: ../app/models/host/discovered.rb:220
507
488
  msgid "Invalid hostname: Could not normalize the hostname"
508
489
  msgstr "无效的主机名:无法标准化主机名"
509
490
 
@@ -533,7 +514,7 @@ msgstr "为 %s 重建 DNS"
533
514
 
534
515
  #: ../app/models/setting/discovered.rb:17
535
516
  msgid "The default location to place discovered hosts in"
536
- msgstr "放置已發現之主機的預設位置"
517
+ msgstr "放置发现主机的默认位置"
537
518
 
538
519
  #: ../app/models/setting/discovered.rb:17
539
520
  msgid "Discovery location"
@@ -541,7 +522,7 @@ msgstr "发现位置"
541
522
 
542
523
  #: ../app/models/setting/discovered.rb:18
543
524
  msgid "The default organization to place discovered hosts in"
544
- msgstr "放置已發現之主機的預設組織"
525
+ msgstr "放置发现主机的默认机构"
545
526
 
546
527
  #: ../app/models/setting/discovered.rb:18
547
528
  msgid "Discovery organization"
@@ -573,7 +554,7 @@ msgstr "清除所有详情"
573
554
 
574
555
  #: ../app/models/setting/discovered.rb:22
575
556
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
576
- msgstr "用于主机名的详情列表(用逗号隔开,首个 wins)"
557
+ msgstr "用于主机名的详情列表(用逗号隔开,第一个有最高优先级)"
577
558
 
578
559
  #: ../app/models/setting/discovered.rb:22
579
560
  msgid "Hostname facts"
@@ -711,6 +692,14 @@ msgstr "发现主机名的名称特征"
711
692
  msgid "Type of name generator"
712
693
  msgstr "名称生成器类型"
713
694
 
695
+ #: ../app/models/setting/discovered.rb:40
696
+ msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
697
+ msgstr ""
698
+
699
+ #: ../app/models/setting/discovered.rb:40
700
+ msgid "Prefer IPv6"
701
+ msgstr ""
702
+
714
703
  #: ../app/services/foreman_discovery/fact_parser.rb:4
715
704
  msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
716
705
  msgstr "发现事实解析器无法在未发现主机 '%{host}' 上工作"
@@ -723,6 +712,34 @@ msgstr "发现的主机 '%{host}' 的所有 NIC 都被过滤掉,过滤:%{fil
723
712
  msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
724
713
  msgstr "无法找到带有通过 '%{fact}' 指定的 '%{mac}' 的主 NIC。NIC 过滤:%{filter}"
725
714
 
715
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:7
716
+ msgid "Highlights"
717
+ msgstr "亮点"
718
+
719
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:8
720
+ msgid "Storage"
721
+ msgstr "存储"
722
+
723
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:9
724
+ msgid "Hardware"
725
+ msgstr "硬件"
726
+
727
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:10
728
+ msgid "Network"
729
+ msgstr "网络"
730
+
731
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:11
732
+ msgid "Software"
733
+ msgstr "软件"
734
+
735
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:12
736
+ msgid "IPMI"
737
+ msgstr "IPMI"
738
+
739
+ #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:13
740
+ msgid "Miscellaneous"
741
+ msgstr "杂项"
742
+
726
743
  #: ../app/services/foreman_discovery/host_converter.rb:47
727
744
  msgid "IPAM must be configured for subnet '%s'"
728
745
  msgstr "必须为子网 '%s' 配置 IPAM"
@@ -735,6 +752,10 @@ msgstr "镜像 API 返回 HTTP/%{code},带有 '%{body}"
735
752
  msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
736
753
  msgstr "图片 API 处理错误:%{msg} (HTTP /%{code} , 内容:%{body} )"
737
754
 
755
+ #: ../app/services/foreman_discovery/ui_notifications/new_host.rb:22
756
+ msgid "Host %s has been dicovered"
757
+ msgstr "主机 %s 已被发现。"
758
+
738
759
  #: ../app/views/dashboard/_discovery_widget.html.erb:5
739
760
  msgid "Discovered Host"
740
761
  msgid_plural "Discovered Hosts"
@@ -746,7 +767,7 @@ msgstr "没有可用的发现主机"
746
767
 
747
768
  #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:3
748
769
  msgid "Host"
749
- msgstr "主办"
770
+ msgstr "主机"
750
771
 
751
772
  #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../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
752
773
  msgid "Model"
@@ -758,7 +779,7 @@ msgstr "CPU"
758
779
 
759
780
  #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
760
781
  msgid "Memory"
761
- msgstr "记忆"
782
+ msgstr "内存"
762
783
 
763
784
  #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
764
785
  msgid "Customize Host"
@@ -770,11 +791,11 @@ msgstr "创建主机"
770
791
 
771
792
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
772
793
  msgid "Select all items in this page"
773
- msgstr "選擇這頁中的所有項目"
794
+ msgstr "选择这个页中的所有项"
774
795
 
775
796
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
776
797
  msgid "items selected. Uncheck to Clear"
777
- msgstr "已選取項目。反選以清除"
798
+ msgstr "选择的项。取消选中以清除"
778
799
 
779
800
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../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
780
801
  msgid "Name"
@@ -782,7 +803,7 @@ msgstr "名称"
782
803
 
783
804
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
784
805
  msgid "IP Address"
785
- msgstr "IP地址"
806
+ msgstr "IP 地址"
786
807
 
787
808
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
788
809
  msgid "Disk Count"
@@ -792,11 +813,11 @@ msgstr "磁盘计数"
792
813
  msgid "Disks Size"
793
814
  msgstr "磁盘大小"
794
815
 
795
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
816
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9 ../app/views/discovery_rules/index.html.erb:11
796
817
  msgid "Location"
797
818
  msgstr "位置"
798
819
 
799
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
820
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10 ../app/views/discovery_rules/index.html.erb:12
800
821
  msgid "Organization"
801
822
  msgstr "机构"
802
823
 
@@ -806,15 +827,15 @@ msgstr "子网"
806
827
 
807
828
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
808
829
  msgid "Last Facts Upload"
809
- msgstr "最后详情上传"
830
+ msgstr "最后事实上传"
810
831
 
811
- #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:12
832
+ #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:14
812
833
  msgid "Actions"
813
834
  msgstr "操作"
814
835
 
815
836
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
816
837
  msgid "Please Confirm"
817
- msgstr "請確認"
838
+ msgstr "请确认"
818
839
 
819
840
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
820
841
  msgid "Cancel"
@@ -830,15 +851,15 @@ msgstr "置备 %s"
830
851
 
831
852
  #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
832
853
  msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
833
- msgstr "這可能會花上一段時間,因為所有主機、詳情與報告皆會被刪除"
854
+ msgstr "这可能需要一段时间,因为所有主机,事实和报告也将被销毁。"
834
855
 
835
856
  #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
836
857
  msgid "Select location"
837
- msgstr "選擇位置"
858
+ msgstr "选择位置"
838
859
 
839
860
  #: ../app/views/discovered_hosts/select_multiple_organization.html.erb:5
840
861
  msgid "Select organization"
841
- msgstr "選擇組織"
862
+ msgstr "选择机构"
842
863
 
843
864
  #: ../app/views/discovered_hosts/show.html.erb:1
844
865
  msgid "Discovered host: %s"
@@ -850,7 +871,7 @@ msgstr "接口"
850
871
 
851
872
  #: ../app/views/discovered_hosts/show.html.erb:44
852
873
  msgid "Type"
853
- msgstr "類型"
874
+ msgstr "类型"
854
875
 
855
876
  #: ../app/views/discovered_hosts/show.html.erb:45
856
877
  msgid "Identifier"
@@ -858,11 +879,11 @@ msgstr "鉴定"
858
879
 
859
880
  #: ../app/views/discovered_hosts/show.html.erb:46
860
881
  msgid "MAC address"
861
- msgstr "MAC 位址"
882
+ msgstr "MAC 地址"
862
883
 
863
884
  #: ../app/views/discovered_hosts/show.html.erb:47
864
885
  msgid "IP address"
865
- msgstr "IP 位址"
886
+ msgstr "IP 地址"
866
887
 
867
888
  #: ../app/views/discovered_hosts/show.html.erb:66
868
889
  msgid "Collapse All"
@@ -886,11 +907,11 @@ msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
886
907
 
887
908
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
888
909
  msgid "Disk count"
889
- msgstr "磁碟計數"
910
+ msgstr "磁盘计数"
890
911
 
891
912
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
892
913
  msgid "Disks size"
893
- msgstr "磁碟大小"
914
+ msgstr "磁盘大小"
894
915
 
895
916
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:31
896
917
  msgid "No discovered hosts for the selected period"
@@ -926,7 +947,7 @@ msgstr "置备主机的主机名"
926
947
 
927
948
  #: ../app/views/discovery_rules/_form.html.erb:26
928
949
  msgid "Hosts Limit"
929
- msgstr "主機限制"
950
+ msgstr "主机限制"
930
951
 
931
952
  #: ../app/views/discovery_rules/_form.html.erb:26
932
953
  msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
@@ -956,6 +977,10 @@ msgstr "创建主机名模式时,确保生成的主机名是唯一的。"
956
977
  msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
957
978
  msgstr "主机名不得以数字开始。一种好方法是使用 facter 提供的独特信息(MAC 地址、BIOS 或序列 ID)。"
958
979
 
980
+ #: ../app/views/discovery_rules/clone.erb:1
981
+ msgid "Clone %s"
982
+ msgstr "克隆 %s"
983
+
959
984
  #: ../app/views/discovery_rules/edit.html.erb:1
960
985
  msgid "Edit %s"
961
986
  msgstr "编辑 %s"
@@ -970,7 +995,7 @@ msgstr "创建规则"
970
995
 
971
996
  #: ../app/views/discovery_rules/index.html.erb:6
972
997
  msgid "DiscoveryRule|Name"
973
- msgstr "发现规则|名称"
998
+ msgstr "DiscoveryRule|Name"
974
999
 
975
1000
  #: ../app/views/discovery_rules/index.html.erb:7
976
1001
  msgid "DiscoveryRule|Priority"
@@ -978,19 +1003,19 @@ msgstr "发现规则|优先级"
978
1003
 
979
1004
  #: ../app/views/discovery_rules/index.html.erb:8
980
1005
  msgid "DiscoveryRule|Query"
981
- msgstr "发现规则|查询"
1006
+ msgstr "DiscoveryRule|Query"
982
1007
 
983
1008
  #: ../app/views/discovery_rules/index.html.erb:9
984
1009
  msgid "Host Group"
985
- msgstr "主機群組"
1010
+ msgstr "主机组"
986
1011
 
987
1012
  #: ../app/views/discovery_rules/index.html.erb:10
988
1013
  msgid "Hosts/Limit"
989
1014
  msgstr "主机/限制"
990
1015
 
991
- #: ../app/views/discovery_rules/index.html.erb:11
1016
+ #: ../app/views/discovery_rules/index.html.erb:13
992
1017
  msgid "DiscoveryRule|Enabled"
993
- msgstr "发现规则|已启用"
1018
+ msgstr "DiscoveryRule|Enabled"
994
1019
 
995
1020
  #: ../app/views/discovery_rules/new.html.erb:1
996
1021
  msgid "New Discovery Rule"
@@ -998,7 +1023,7 @@ msgstr "新建发现规则"
998
1023
 
999
1024
  #: ../app/views/discovery_rules/welcome.html.erb:8
1000
1025
  msgid "Discovered Rules"
1001
- msgstr ""
1026
+ msgstr "发现规则"
1002
1027
 
1003
1028
  #: ../db/seeds.d/50_discovery_templates.rb:5
1004
1029
  msgid "Command line options for kexec during PXE-less provisioning."
@@ -1009,8 +1034,8 @@ msgid "A summary of discovered hosts"
1009
1034
  msgstr "发现主机概述"
1010
1035
 
1011
1036
  #: ../db/seeds.d/80_discovery_ui_notification.rb:4
1012
- msgid "Hosts"
1013
- msgstr "主机"
1037
+ msgid "New hosts"
1038
+ msgstr "新主机"
1014
1039
 
1015
1040
  #: ../db/seeds.d/80_discovery_ui_notification.rb:6
1016
1041
  msgid "One or more hosts have been discovered"
@@ -1018,44 +1043,52 @@ msgstr "已发现一个或多个主机"
1018
1043
 
1019
1044
  #: ../db/seeds.d/80_discovery_ui_notification.rb:13
1020
1045
  msgid "Details"
1021
- msgstr "细节"
1046
+ msgstr "详情"
1047
+
1048
+ #: ../db/seeds.d/80_discovery_ui_notification.rb:18
1049
+ msgid "Hosts"
1050
+ msgstr "主机"
1022
1051
 
1023
- #: ../lib/foreman_discovery/engine.rb:180
1052
+ #: ../db/seeds.d/80_discovery_ui_notification.rb:20
1053
+ msgid "Error message goes here"
1054
+ msgstr "错误信息到这里"
1055
+
1056
+ #: ../lib/foreman_discovery/engine.rb:176
1024
1057
  msgid "Discovery Kexec template"
1025
1058
  msgstr "发现 Kexec 模板"
1026
1059
 
1027
- #: ../lib/foreman_discovery/engine.rb:189
1060
+ #: ../lib/foreman_discovery/engine.rb:185
1028
1061
  msgid "Discovery Proxy"
1029
1062
  msgstr "发现代理服务器"
1030
1063
 
1031
- #: ../lib/foreman_discovery/engine.rb:190
1064
+ #: ../lib/foreman_discovery/engine.rb:186
1032
1065
  msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1033
1066
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器"
1034
1067
 
1035
- #: ../lib/foreman_discovery/engine.rb:191
1068
+ #: ../lib/foreman_discovery/engine.rb:187
1036
1069
  msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
1037
1070
  msgstr "本子网内用于管理到发现主机的连接的发现代理服务器 ID"
1038
1071
 
1039
1072
  #: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:33
1040
1073
  msgid "For more information please see "
1041
- msgstr ""
1074
+ msgstr "查看详情 "
1042
1075
 
1043
1076
  #: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:34
1044
1077
  msgid "documentation"
1045
- msgstr ""
1078
+ msgstr "文档"
1046
1079
 
1047
1080
  #: action_names.rb:2
1048
- msgid "Action with sub plans"
1049
- msgstr "有子計畫的動作"
1081
+ msgid "Remote action:"
1082
+ msgstr "远程操作:"
1050
1083
 
1051
1084
  #: action_names.rb:3
1052
- msgid "Import facts"
1053
- msgstr "匯入詳情"
1054
-
1055
- #: action_names.rb:4
1056
1085
  msgid "Import Puppet classes"
1057
1086
  msgstr "导入 Puppet 类"
1058
1087
 
1088
+ #: action_names.rb:4
1089
+ msgid "Import facts"
1090
+ msgstr "匯入詳情"
1091
+
1059
1092
  #: action_names.rb:5
1060
- msgid "Remote action:"
1061
- msgstr "远程操作:"
1093
+ msgid "Action with sub plans"
1094
+ msgstr "有子計畫的動作"