foreman_discovery 16.3.6 → 17.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (94) 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 +3 -4
  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/discovered_hosts/welcome.html.erb +1 -1
  13. data/app/views/discovery_rules/clone.erb +3 -0
  14. data/app/views/discovery_rules/index.html.erb +4 -0
  15. data/app/views/discovery_rules/welcome.html.erb +15 -0
  16. data/config/routes.rb +2 -0
  17. data/db/seeds.d/80_discovery_ui_notification.rb +11 -5
  18. data/lib/foreman_discovery/engine.rb +3 -7
  19. data/lib/foreman_discovery/version.rb +1 -1
  20. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  21. data/locale/ca/foreman_discovery.edit.po +44 -40
  22. data/locale/ca/foreman_discovery.po +36 -9
  23. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  24. data/locale/de/foreman_discovery.edit.po +42 -38
  25. data/locale/de/foreman_discovery.po +45 -18
  26. data/locale/en/LC_MESSAGES/foreman_discovery.mo +0 -0
  27. data/locale/en/foreman_discovery.edit.po +37 -29
  28. data/locale/en/foreman_discovery.po +31 -4
  29. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  30. data/locale/en_GB/foreman_discovery.edit.po +39 -35
  31. data/locale/en_GB/foreman_discovery.po +36 -9
  32. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  33. data/locale/es/foreman_discovery.edit.po +42 -38
  34. data/locale/es/foreman_discovery.po +70 -41
  35. data/locale/foreman_discovery.pot +142 -97
  36. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  37. data/locale/fr/foreman_discovery.edit.po +88 -84
  38. data/locale/fr/foreman_discovery.po +76 -49
  39. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  40. data/locale/gl/foreman_discovery.edit.po +42 -38
  41. data/locale/gl/foreman_discovery.po +32 -5
  42. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  43. data/locale/it/foreman_discovery.edit.po +42 -38
  44. data/locale/it/foreman_discovery.po +44 -17
  45. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  46. data/locale/ja/foreman_discovery.edit.po +74 -70
  47. data/locale/ja/foreman_discovery.po +79 -54
  48. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  49. data/locale/ko/foreman_discovery.edit.po +42 -38
  50. data/locale/ko/foreman_discovery.po +43 -16
  51. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  52. data/locale/pt_BR/foreman_discovery.edit.po +42 -38
  53. data/locale/pt_BR/foreman_discovery.po +69 -39
  54. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  55. data/locale/ru/foreman_discovery.edit.po +46 -42
  56. data/locale/ru/foreman_discovery.po +43 -16
  57. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  58. data/locale/sv_SE/foreman_discovery.edit.po +42 -38
  59. data/locale/sv_SE/foreman_discovery.po +34 -7
  60. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  61. data/locale/zh_CN/foreman_discovery.edit.po +90 -86
  62. data/locale/zh_CN/foreman_discovery.po +114 -90
  63. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  64. data/locale/zh_TW/foreman_discovery.edit.po +42 -38
  65. data/locale/zh_TW/foreman_discovery.po +43 -16
  66. data/package.json +6 -6
  67. data/test/functional/api/v2/discovered_hosts_controller_test.rb +9 -0
  68. data/test/functional/discovery_rules_controller_test.rb +6 -1
  69. data/test/integration/discovered_hosts_test.rb +53 -5
  70. data/test/test_helper_discovery.rb +5 -0
  71. data/test/unit/discovery_rule_test.rb +24 -2
  72. data/test/unit/fact_to_category_resolver_test.rb +41 -0
  73. data/test/unit/ui_notifications/destroy_host_test.rb +2 -9
  74. data/test/unit/ui_notifications/new_host_test.rb +3 -3
  75. data/webpack/__mocks__/foremanReact/common/I18n.js +3 -0
  76. data/webpack/__mocks__/foremanReact/common/helpers.js +1 -0
  77. data/webpack/__mocks__/foremanReact/common/index.js +5 -0
  78. data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js +69 -0
  79. data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js +77 -0
  80. data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js +29 -0
  81. data/webpack/__mocks__/foremanReact/components/common/EmptyState/index.js +5 -0
  82. data/webpack/index.js +9 -8
  83. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js +7 -7
  84. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js +12 -0
  85. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap +16 -0
  86. data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js +1 -1
  87. data/webpack/src/ForemanDiscovery/DiscoveredHosts/index.js +3 -3
  88. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js +34 -0
  89. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/index.js +1 -0
  90. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js +19 -0
  91. data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap +22 -0
  92. data/webpack/src/ForemanDiscovery/DiscoveryRules/index.js +6 -0
  93. data/webpack/src/reducers.js +0 -2
  94. metadata +31 -9
@@ -5,10 +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
- "POT-Creation-Date: 2021-05-03 08:46+0200\n"
11
- "PO-Revision-Date: 2021-01-25 08:35+0000\n"
10
+ "POT-Creation-Date: 2021-09-20 17:25+0200\n"
11
+ "PO-Revision-Date: 2021-05-18 15:01+0000\n"
12
12
  "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
13
13
  "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
14
14
  "age/zh_CN/)\n"
@@ -20,7 +20,7 @@ msgstr ""
20
20
 
21
21
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:16
22
22
  msgid "List all discovered hosts"
23
- msgstr "列出所有发现主机"
23
+ msgstr "列出所有发现的主机"
24
24
 
25
25
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
26
26
  msgid "filter results"
@@ -28,15 +28,15 @@ msgstr "过滤结果"
28
28
 
29
29
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
30
30
  msgid "sort results"
31
- msgstr "排序結果"
31
+ msgstr "排序结果"
32
32
 
33
33
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
34
34
  msgid "paginate results"
35
- msgstr "編頁結果"
35
+ msgstr "分页结果"
36
36
 
37
37
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
38
38
  msgid "number of entries per request"
39
- msgstr "每個請求的項目數量"
39
+ msgstr "每个请求的条目数"
40
40
 
41
41
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:26
42
42
  msgid "Show a discovered host"
@@ -56,11 +56,11 @@ msgstr "置备发现主机"
56
56
 
57
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
58
58
  msgid "required if host is managed and value is not inherited from host group"
59
- msgstr "若主機是個受管理的主機,並且值不是由主機群組所繼承的話便需要"
59
+ msgstr "如果主机是受管的,值没有从主机组继承时需要"
60
60
 
61
61
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
62
62
  msgid "not required if using a subnet with DHCP proxy"
63
- msgstr "若是使用一個含有 DHCP 協定的子網路則不需要"
63
+ msgstr "如果使用带有 DHCP 代理的子网则不需要"
64
64
 
65
65
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:56
66
66
  msgid "not required if it's a virtual machine"
@@ -68,7 +68,7 @@ msgstr "如果是虚拟机,则不需要"
68
68
 
69
69
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
70
70
  msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
71
- msgstr "若不是基於映像檔的佈建,而主機受管理並且值並非由主機群組所繼承的話便需要"
71
+ msgstr "如果不是基于置备镜像,主机是受管的,值没有从主机组继承时需要"
72
72
 
73
73
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
74
74
  msgid "required if host is managed and custom partition has not been defined"
@@ -76,7 +76,7 @@ msgstr "如果已管理主机,且未定义自定义分区,则需填写。"
76
76
 
77
77
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
78
78
  msgid "Host's owner type"
79
- msgstr "主机拥有者类型"
79
+ msgstr "主机所有者类型"
80
80
 
81
81
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
82
82
  msgid "Host's parameters (array or indexed hash)"
@@ -84,7 +84,7 @@ msgstr "主机参数(阵列或索引哈希)"
84
84
 
85
85
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
86
86
  msgid "Name of the parameter"
87
- msgstr "參數名稱"
87
+ msgstr "参数名"
88
88
 
89
89
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
90
90
  msgid "Parameter value"
@@ -96,7 +96,7 @@ msgstr "值类型"
96
96
 
97
97
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
98
98
  msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
99
- msgstr "用來追蹤協調流程任務狀態的 UUID,GET /api/orchestration/:UUID/tasks"
99
+ msgstr "用于跟踪编配任务状态的 UUID,GET /api/orchestration/:UUID/tasks"
100
100
 
101
101
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
102
102
  msgid "required if value is not inherited from host group or default password in settings"
@@ -108,7 +108,7 @@ msgstr "删除发现主机"
108
108
 
109
109
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
110
110
  msgid "Upload facts for a host, creating the host if required"
111
- msgstr "上傳主機的詳情,並視需求建立主機"
111
+ msgstr "上载主机的事实,并根据需要创建主机"
112
112
 
113
113
  #: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
114
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)"
@@ -118,7 +118,7 @@ msgstr "hash 包含具备最小详情集合的主机的详情:discovery_bootif
118
118
  msgid "Execute rules against a discovered host"
119
119
  msgstr "对发现主机执行规则"
120
120
 
121
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:157
121
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:160
122
122
  msgid "Host %{host} was provisioned with rule %{rule}"
123
123
  msgstr "主机 %{host} 被置备,带有规则 %{rule}"
124
124
 
@@ -126,7 +126,7 @@ msgstr "主机 %{host} 被置备,带有规则 %{rule}"
126
126
  msgid "Unable to provision %{host}: %{errors}"
127
127
  msgstr "无法置备 %{host}:%{errors}"
128
128
 
129
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:164
129
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:167
130
130
  msgid "No rule found for host %s"
131
131
  msgstr "没有为主机 %s 找到规则"
132
132
 
@@ -134,11 +134,11 @@ msgstr "没有为主机 %s 找到规则"
134
134
  msgid "Execute rules against all currently discovered hosts"
135
135
  msgstr "对当前所有发现主机执行规则"
136
136
 
137
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:170
137
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:173
138
138
  msgid "Errors during auto provisioning: %s"
139
139
  msgstr "自动置备期间出错:%s"
140
140
 
141
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:173
141
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:176
142
142
  msgid "No discovered hosts to provision"
143
143
  msgstr "没有要置备的发现主机"
144
144
 
@@ -158,7 +158,7 @@ msgstr "重启发现主机"
158
158
  msgid "Rebooting all discovered hosts"
159
159
  msgstr "重启所有发现主机"
160
160
 
161
- #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:126
161
+ #: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:129
162
162
  msgid "Discovered hosts are rebooting now"
163
163
  msgstr "现在正在重启发现主机"
164
164
 
@@ -238,75 +238,75 @@ msgstr "重启时出错:%s"
238
238
  msgid "No discovered hosts to reboot"
239
239
  msgstr "没有要重启的发现主机"
240
240
 
241
- #: ../app/controllers/discovered_hosts_controller.rb:60
241
+ #: ../app/controllers/discovered_hosts_controller.rb:63
242
242
  msgid "Successfully provisioned %s"
243
243
  msgstr "已成功置备 %s"
244
244
 
245
- #: ../app/controllers/discovered_hosts_controller.rb:94
245
+ #: ../app/controllers/discovered_hosts_controller.rb:97
246
246
  msgid "Facts refreshed for %s"
247
247
  msgstr "%s 的事实已刷新"
248
248
 
249
- #: ../app/controllers/discovered_hosts_controller.rb:96
249
+ #: ../app/controllers/discovered_hosts_controller.rb:99
250
250
  msgid "Failed to refresh facts for %s"
251
251
  msgstr "%s 的事实刷新失败"
252
252
 
253
- #: ../app/controllers/discovered_hosts_controller.rb:99
253
+ #: ../app/controllers/discovered_hosts_controller.rb:102
254
254
  msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
255
255
  msgstr "为 %{hostname} 刷新事实失败,错误为 %{error_message}"
256
256
 
257
- #: ../app/controllers/discovered_hosts_controller.rb:106
257
+ #: ../app/controllers/discovered_hosts_controller.rb:109
258
258
  msgid "Host of type %s can not be rebooted"
259
259
  msgstr "%s 类型的主机不能重启"
260
260
 
261
- #: ../app/controllers/discovered_hosts_controller.rb:110
261
+ #: ../app/controllers/discovered_hosts_controller.rb:113
262
262
  msgid "Rebooting host %s"
263
263
  msgstr "正在重启主机 %s"
264
264
 
265
- #: ../app/controllers/discovered_hosts_controller.rb:112
265
+ #: ../app/controllers/discovered_hosts_controller.rb:115
266
266
  msgid "Failed to reboot host %s"
267
267
  msgstr "重启主机 %s 失败"
268
268
 
269
- #: ../app/controllers/discovered_hosts_controller.rb:115
269
+ #: ../app/controllers/discovered_hosts_controller.rb:118
270
270
  msgid "Failed to reboot host %{hostname} with error %{error_message}"
271
271
  msgstr "重启主机 %{hostname} 失败,错误为 %{error_message}"
272
272
 
273
- #: ../app/controllers/discovered_hosts_controller.rb:129
273
+ #: ../app/controllers/discovered_hosts_controller.rb:132
274
274
  msgid "Failed to reboot hosts with error %s"
275
275
  msgstr "无法重启主机,错误 %s"
276
276
 
277
- #: ../app/controllers/discovered_hosts_controller.rb:147
277
+ #: ../app/controllers/discovered_hosts_controller.rb:150
278
278
  msgid "Destroyed selected hosts"
279
- msgstr "刪除選擇的主機"
279
+ msgstr "销毁选定的主机"
280
280
 
281
- #: ../app/controllers/discovered_hosts_controller.rb:149
281
+ #: ../app/controllers/discovered_hosts_controller.rb:152
282
282
  msgid "The following hosts were not deleted: %s"
283
283
  msgstr "以下主机没有删除:%s"
284
284
 
285
- #: ../app/controllers/discovered_hosts_controller.rb:161
285
+ #: ../app/controllers/discovered_hosts_controller.rb:164
286
286
  msgid "Failed to auto provision host %s: %s"
287
287
  msgstr "无法自动置备主机 %s:%s"
288
288
 
289
- #: ../app/controllers/discovered_hosts_controller.rb:189
289
+ #: ../app/controllers/discovered_hosts_controller.rb:192
290
290
  msgid "Discovered hosts are provisioning now"
291
291
  msgstr "现在发现主机正在置备"
292
292
 
293
- #: ../app/controllers/discovered_hosts_controller.rb:270
293
+ #: ../app/controllers/discovered_hosts_controller.rb:277
294
294
  msgid "Discovered host reported from unknown subnet, communication will not be proxied."
295
- msgstr ""
295
+ msgstr "从未知子网报告发现的主机,通信数据将不会被代理。"
296
296
 
297
- #: ../app/controllers/discovered_hosts_controller.rb:275
297
+ #: ../app/controllers/discovered_hosts_controller.rb:282
298
298
  msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
299
- msgstr ""
299
+ msgstr "从未知子网报告发现的主机为 %s,通信数据将不会被代理。"
300
300
 
301
- #: ../app/controllers/discovered_hosts_controller.rb:289
301
+ #: ../app/controllers/discovered_hosts_controller.rb:296
302
302
  msgid "No hosts were found with that id or name"
303
- msgstr "沒有找到擁有此 ID 或名稱的主機"
303
+ msgstr "找不到具有该 ID 或名称的主机"
304
304
 
305
- #: ../app/controllers/discovered_hosts_controller.rb:293
305
+ #: ../app/controllers/discovered_hosts_controller.rb:300
306
306
  msgid "No hosts selected"
307
- msgstr "未選擇主機"
307
+ msgstr "未选择主机"
308
308
 
309
- #: ../app/controllers/discovered_hosts_controller.rb:299
309
+ #: ../app/controllers/discovered_hosts_controller.rb:306
310
310
  msgid "Something went wrong while selecting hosts - %s"
311
311
  msgstr "选择主机时出错 - %s"
312
312
 
@@ -324,7 +324,7 @@ msgstr "自动置备"
324
324
 
325
325
  #: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
326
326
  msgid "Refresh facts"
327
- msgstr "刷新詳情"
327
+ msgstr "刷新详情"
328
328
 
329
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
330
330
  msgid "Reboot"
@@ -336,7 +336,7 @@ msgstr "返回"
336
336
 
337
337
  #: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
338
338
  msgid "Select Action"
339
- msgstr "選擇動作"
339
+ msgstr "选择操作"
340
340
 
341
341
  #: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
342
342
  msgid "Delete %s?"
@@ -344,11 +344,11 @@ msgstr "刪除 %s?"
344
344
 
345
345
  #: ../app/helpers/discovered_hosts_helper.rb:31
346
346
  msgid "Assign Organization"
347
- msgstr "指定組織"
347
+ msgstr "分配机构"
348
348
 
349
349
  #: ../app/helpers/discovered_hosts_helper.rb:32
350
350
  msgid "Assign Location"
351
- msgstr "指定位置"
351
+ msgstr "分配位置"
352
352
 
353
353
  #: ../app/helpers/discovered_hosts_helper.rb:33
354
354
  msgid "Delete"
@@ -360,7 +360,7 @@ msgstr "%s - 以下主机即将更改"
360
360
 
361
361
  #: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
362
362
  msgid "N/A"
363
- msgstr "N / A"
363
+ msgstr "不适用"
364
364
 
365
365
  #: ../app/helpers/discovered_hosts_helper.rb:58
366
366
  msgid "New in the last 24 hours"
@@ -404,7 +404,7 @@ msgstr "启用规则 '%s'?"
404
404
 
405
405
  #: ../app/helpers/discovery_rules_helper.rb:33
406
406
  msgid "Clone"
407
- msgstr ""
407
+ msgstr "克隆"
408
408
 
409
409
  #: ../app/helpers/discovery_rules_helper.rb:34
410
410
  msgid "Delete rule '%s'?"
@@ -468,23 +468,23 @@ msgstr "无效详情:hash 不包含 discovery_hostname 设置中任何详情
468
468
  msgid "Facts could not be imported"
469
469
  msgstr "无法导入详情"
470
470
 
471
- #: ../app/models/host/discovered.rb:146
471
+ #: ../app/models/host/discovered.rb:155
472
472
  msgid "Could not get facts from proxy %{url}: %{error}"
473
473
  msgstr "无法从代理 %{url} 获得详情:%{error}"
474
474
 
475
- #: ../app/models/host/discovered.rb:160
475
+ #: ../app/models/host/discovered.rb:173
476
476
  msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
477
477
  msgstr "无法在%{name}(%{url})上执行重新引导:%{msg}"
478
478
 
479
- #: ../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
480
480
  msgid "Unable to perform %{action} on %{ips}"
481
481
  msgstr "无法在 %{ips} 上执行 %{action}"
482
482
 
483
- #: ../app/models/host/discovered.rb:179
483
+ #: ../app/models/host/discovered.rb:196
484
484
  msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
485
485
  msgstr "无法在 %{name} (%{url}) 上执行 kexec : %{msg}"
486
486
 
487
- #: ../app/models/host/discovered.rb:203
487
+ #: ../app/models/host/discovered.rb:220
488
488
  msgid "Invalid hostname: Could not normalize the hostname"
489
489
  msgstr "无效的主机名:无法标准化主机名"
490
490
 
@@ -514,7 +514,7 @@ msgstr "为 %s 重建 DNS"
514
514
 
515
515
  #: ../app/models/setting/discovered.rb:17
516
516
  msgid "The default location to place discovered hosts in"
517
- msgstr "放置已發現之主機的預設位置"
517
+ msgstr "放置发现主机的默认位置"
518
518
 
519
519
  #: ../app/models/setting/discovered.rb:17
520
520
  msgid "Discovery location"
@@ -522,7 +522,7 @@ msgstr "发现位置"
522
522
 
523
523
  #: ../app/models/setting/discovered.rb:18
524
524
  msgid "The default organization to place discovered hosts in"
525
- msgstr "放置已發現之主機的預設組織"
525
+ msgstr "放置发现主机的默认机构"
526
526
 
527
527
  #: ../app/models/setting/discovered.rb:18
528
528
  msgid "Discovery organization"
@@ -554,7 +554,7 @@ msgstr "清除所有详情"
554
554
 
555
555
  #: ../app/models/setting/discovered.rb:22
556
556
  msgid "List of facts to use for the hostname (separated by comma, first wins)"
557
- msgstr "用于主机名的详情列表(用逗号隔开,首个 wins)"
557
+ msgstr "用于主机名的详情列表(用逗号隔开,第一个有最高优先级)"
558
558
 
559
559
  #: ../app/models/setting/discovered.rb:22
560
560
  msgid "Hostname facts"
@@ -692,6 +692,14 @@ msgstr "发现主机名的名称特征"
692
692
  msgid "Type of name generator"
693
693
  msgstr "名称生成器类型"
694
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
+
695
703
  #: ../app/services/foreman_discovery/fact_parser.rb:4
696
704
  msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
697
705
  msgstr "发现事实解析器无法在未发现主机 '%{host}' 上工作"
@@ -746,7 +754,7 @@ msgstr "图片 API 处理错误:%{msg} (HTTP /%{code} , 内容:%{body}
746
754
 
747
755
  #: ../app/services/foreman_discovery/ui_notifications/new_host.rb:22
748
756
  msgid "Host %s has been dicovered"
749
- msgstr ""
757
+ msgstr "主机 %s 已被发现。"
750
758
 
751
759
  #: ../app/views/dashboard/_discovery_widget.html.erb:5
752
760
  msgid "Discovered Host"
@@ -759,7 +767,7 @@ msgstr "没有可用的发现主机"
759
767
 
760
768
  #: ../app/views/dashboard/_discovery_widget_host_list.html.erb:3
761
769
  msgid "Host"
762
- msgstr "主办"
770
+ msgstr "主机"
763
771
 
764
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
765
773
  msgid "Model"
@@ -771,7 +779,7 @@ msgstr "CPU"
771
779
 
772
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
773
781
  msgid "Memory"
774
- msgstr "记忆"
782
+ msgstr "内存"
775
783
 
776
784
  #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
777
785
  msgid "Customize Host"
@@ -783,11 +791,11 @@ msgstr "创建主机"
783
791
 
784
792
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
785
793
  msgid "Select all items in this page"
786
- msgstr "選擇這頁中的所有項目"
794
+ msgstr "选择这个页中的所有项"
787
795
 
788
796
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
789
797
  msgid "items selected. Uncheck to Clear"
790
- msgstr "已選取項目。反選以清除"
798
+ msgstr "选择的项。取消选中以清除"
791
799
 
792
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
793
801
  msgid "Name"
@@ -795,7 +803,7 @@ msgstr "名称"
795
803
 
796
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
797
805
  msgid "IP Address"
798
- msgstr "IP地址"
806
+ msgstr "IP 地址"
799
807
 
800
808
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
801
809
  msgid "Disk Count"
@@ -819,7 +827,7 @@ msgstr "子网"
819
827
 
820
828
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
821
829
  msgid "Last Facts Upload"
822
- msgstr "最后详情上传"
830
+ msgstr "最后事实上传"
823
831
 
824
832
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:14
825
833
  msgid "Actions"
@@ -827,7 +835,7 @@ msgstr "操作"
827
835
 
828
836
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
829
837
  msgid "Please Confirm"
830
- msgstr "請確認"
838
+ msgstr "请确认"
831
839
 
832
840
  #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
833
841
  msgid "Cancel"
@@ -843,15 +851,15 @@ msgstr "置备 %s"
843
851
 
844
852
  #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
845
853
  msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
846
- msgstr "這可能會花上一段時間,因為所有主機、詳情與報告皆會被刪除"
854
+ msgstr "这可能需要一段时间,因为所有主机,事实和报告也将被销毁。"
847
855
 
848
856
  #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
849
857
  msgid "Select location"
850
- msgstr "選擇位置"
858
+ msgstr "选择位置"
851
859
 
852
860
  #: ../app/views/discovered_hosts/select_multiple_organization.html.erb:5
853
861
  msgid "Select organization"
854
- msgstr "選擇組織"
862
+ msgstr "选择机构"
855
863
 
856
864
  #: ../app/views/discovered_hosts/show.html.erb:1
857
865
  msgid "Discovered host: %s"
@@ -863,7 +871,7 @@ msgstr "接口"
863
871
 
864
872
  #: ../app/views/discovered_hosts/show.html.erb:44
865
873
  msgid "Type"
866
- msgstr "類型"
874
+ msgstr "类型"
867
875
 
868
876
  #: ../app/views/discovered_hosts/show.html.erb:45
869
877
  msgid "Identifier"
@@ -871,11 +879,11 @@ msgstr "鉴定"
871
879
 
872
880
  #: ../app/views/discovered_hosts/show.html.erb:46
873
881
  msgid "MAC address"
874
- msgstr "MAC 位址"
882
+ msgstr "MAC 地址"
875
883
 
876
884
  #: ../app/views/discovered_hosts/show.html.erb:47
877
885
  msgid "IP address"
878
- msgstr "IP 位址"
886
+ msgstr "IP 地址"
879
887
 
880
888
  #: ../app/views/discovered_hosts/show.html.erb:66
881
889
  msgid "Collapse All"
@@ -899,11 +907,11 @@ msgstr "来自 %{foreman_url} Foreman 服务器的发现主机"
899
907
 
900
908
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
901
909
  msgid "Disk count"
902
- msgstr "磁碟計數"
910
+ msgstr "磁盘计数"
903
911
 
904
912
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
905
913
  msgid "Disks size"
906
- msgstr "磁碟大小"
914
+ msgstr "磁盘大小"
907
915
 
908
916
  #: ../app/views/discovered_mailer/discovered_summary.html.erb:31
909
917
  msgid "No discovered hosts for the selected period"
@@ -939,7 +947,7 @@ msgstr "置备主机的主机名"
939
947
 
940
948
  #: ../app/views/discovery_rules/_form.html.erb:26
941
949
  msgid "Hosts Limit"
942
- msgstr "主機限制"
950
+ msgstr "主机限制"
943
951
 
944
952
  #: ../app/views/discovery_rules/_form.html.erb:26
945
953
  msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
@@ -971,7 +979,7 @@ msgstr "主机名不得以数字开始。一种好方法是使用 facter 提供
971
979
 
972
980
  #: ../app/views/discovery_rules/clone.erb:1
973
981
  msgid "Clone %s"
974
- msgstr ""
982
+ msgstr "克隆 %s"
975
983
 
976
984
  #: ../app/views/discovery_rules/edit.html.erb:1
977
985
  msgid "Edit %s"
@@ -987,7 +995,7 @@ msgstr "创建规则"
987
995
 
988
996
  #: ../app/views/discovery_rules/index.html.erb:6
989
997
  msgid "DiscoveryRule|Name"
990
- msgstr "发现规则|名称"
998
+ msgstr "DiscoveryRule|Name"
991
999
 
992
1000
  #: ../app/views/discovery_rules/index.html.erb:7
993
1001
  msgid "DiscoveryRule|Priority"
@@ -995,11 +1003,11 @@ msgstr "发现规则|优先级"
995
1003
 
996
1004
  #: ../app/views/discovery_rules/index.html.erb:8
997
1005
  msgid "DiscoveryRule|Query"
998
- msgstr "发现规则|查询"
1006
+ msgstr "DiscoveryRule|Query"
999
1007
 
1000
1008
  #: ../app/views/discovery_rules/index.html.erb:9
1001
1009
  msgid "Host Group"
1002
- msgstr "主機群組"
1010
+ msgstr "主机组"
1003
1011
 
1004
1012
  #: ../app/views/discovery_rules/index.html.erb:10
1005
1013
  msgid "Hosts/Limit"
@@ -1007,7 +1015,7 @@ msgstr "主机/限制"
1007
1015
 
1008
1016
  #: ../app/views/discovery_rules/index.html.erb:13
1009
1017
  msgid "DiscoveryRule|Enabled"
1010
- msgstr "发现规则|已启用"
1018
+ msgstr "DiscoveryRule|Enabled"
1011
1019
 
1012
1020
  #: ../app/views/discovery_rules/new.html.erb:1
1013
1021
  msgid "New Discovery Rule"
@@ -1015,7 +1023,7 @@ msgstr "新建发现规则"
1015
1023
 
1016
1024
  #: ../app/views/discovery_rules/welcome.html.erb:8
1017
1025
  msgid "Discovered Rules"
1018
- msgstr ""
1026
+ msgstr "发现规则"
1019
1027
 
1020
1028
  #: ../db/seeds.d/50_discovery_templates.rb:5
1021
1029
  msgid "Command line options for kexec during PXE-less provisioning."
@@ -1027,7 +1035,7 @@ msgstr "发现主机概述"
1027
1035
 
1028
1036
  #: ../db/seeds.d/80_discovery_ui_notification.rb:4
1029
1037
  msgid "New hosts"
1030
- msgstr ""
1038
+ msgstr "新主机"
1031
1039
 
1032
1040
  #: ../db/seeds.d/80_discovery_ui_notification.rb:6
1033
1041
  msgid "One or more hosts have been discovered"
@@ -1035,7 +1043,7 @@ msgstr "已发现一个或多个主机"
1035
1043
 
1036
1044
  #: ../db/seeds.d/80_discovery_ui_notification.rb:13
1037
1045
  msgid "Details"
1038
- msgstr "细节"
1046
+ msgstr "详情"
1039
1047
 
1040
1048
  #: ../db/seeds.d/80_discovery_ui_notification.rb:18
1041
1049
  msgid "Hosts"
@@ -1043,7 +1051,7 @@ msgstr "主机"
1043
1051
 
1044
1052
  #: ../db/seeds.d/80_discovery_ui_notification.rb:20
1045
1053
  msgid "Error message goes here"
1046
- msgstr ""
1054
+ msgstr "错误信息到这里"
1047
1055
 
1048
1056
  #: ../lib/foreman_discovery/engine.rb:176
1049
1057
  msgid "Discovery Kexec template"
@@ -1084,7 +1092,3 @@ msgstr "匯入詳情"
1084
1092
  #: action_names.rb:5
1085
1093
  msgid "Action with sub plans"
1086
1094
  msgstr "有子計畫的動作"
1087
-
1088
- #: ../app/helpers/discovered_hosts_helper.rb:10
1089
- #~ msgid "%s ago"
1090
- #~ msgstr "%s 前"