katello 4.0.0.rc3.1 → 4.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of katello might be problematic. Click here for more details.

Files changed (84) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/katello/api/registry/registry_proxies_controller.rb +2 -2
  3. data/app/helpers/katello/katello_urls_helper.rb +2 -2
  4. data/app/models/katello/concerns/smart_proxy_extensions.rb +1 -1
  5. data/app/models/katello/glue/pulp/repo.rb +6 -12
  6. data/app/models/katello/host/content_facet.rb +1 -1
  7. data/app/models/katello/ping.rb +4 -4
  8. data/app/services/katello/managed_content_medium_provider.rb +1 -1
  9. data/app/services/katello/pulp/repository/yum.rb +1 -1
  10. data/app/services/katello/pulp3/migration.rb +2 -2
  11. data/app/services/katello/pulp3/repository.rb +1 -4
  12. data/app/services/katello/pulp3/repository/yum.rb +1 -1
  13. data/app/services/katello/pulp3/task_group.rb +3 -0
  14. data/lib/katello/version.rb +1 -1
  15. data/locale/action_names.rb +24 -28
  16. data/locale/bn/LC_MESSAGES/katello.mo +0 -0
  17. data/locale/bn/katello.edit.po +199 -195
  18. data/locale/bn/katello.po +135 -99
  19. data/locale/cs/LC_MESSAGES/katello.mo +0 -0
  20. data/locale/cs/katello.edit.po +197 -193
  21. data/locale/cs/katello.po +135 -98
  22. data/locale/de/LC_MESSAGES/katello.mo +0 -0
  23. data/locale/de/katello.edit.po +199 -192
  24. data/locale/de/katello.po +136 -100
  25. data/locale/en/LC_MESSAGES/katello.mo +0 -0
  26. data/locale/en/katello.edit.po +188 -184
  27. data/locale/en/katello.po +135 -98
  28. data/locale/es/LC_MESSAGES/katello.mo +0 -0
  29. data/locale/es/katello.edit.po +199 -192
  30. data/locale/es/katello.po +136 -100
  31. data/locale/fr/LC_MESSAGES/katello.mo +0 -0
  32. data/locale/fr/katello.edit.po +199 -192
  33. data/locale/fr/katello.po +136 -99
  34. data/locale/gu/LC_MESSAGES/katello.mo +0 -0
  35. data/locale/gu/katello.edit.po +199 -195
  36. data/locale/gu/katello.po +135 -99
  37. data/locale/hi/LC_MESSAGES/katello.mo +0 -0
  38. data/locale/hi/katello.edit.po +199 -195
  39. data/locale/hi/katello.po +135 -99
  40. data/locale/it/LC_MESSAGES/katello.mo +0 -0
  41. data/locale/it/katello.edit.po +199 -192
  42. data/locale/it/katello.po +136 -99
  43. data/locale/ja/LC_MESSAGES/katello.mo +0 -0
  44. data/locale/ja/katello.edit.po +199 -192
  45. data/locale/ja/katello.po +136 -99
  46. data/locale/katello.pot +756 -697
  47. data/locale/kn/LC_MESSAGES/katello.mo +0 -0
  48. data/locale/kn/katello.edit.po +199 -195
  49. data/locale/kn/katello.po +135 -99
  50. data/locale/ko/LC_MESSAGES/katello.mo +0 -0
  51. data/locale/ko/katello.edit.po +199 -192
  52. data/locale/ko/katello.po +136 -99
  53. data/locale/mr/LC_MESSAGES/katello.mo +0 -0
  54. data/locale/mr/katello.edit.po +198 -194
  55. data/locale/mr/katello.po +135 -99
  56. data/locale/or/LC_MESSAGES/katello.mo +0 -0
  57. data/locale/or/katello.edit.po +199 -195
  58. data/locale/or/katello.po +135 -99
  59. data/locale/pa/LC_MESSAGES/katello.mo +0 -0
  60. data/locale/pa/katello.edit.po +199 -195
  61. data/locale/pa/katello.po +135 -99
  62. data/locale/pt/LC_MESSAGES/katello.mo +0 -0
  63. data/locale/pt/katello.edit.po +191 -187
  64. data/locale/pt/katello.po +135 -99
  65. data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
  66. data/locale/pt_BR/katello.edit.po +199 -192
  67. data/locale/pt_BR/katello.po +136 -99
  68. data/locale/ru/LC_MESSAGES/katello.mo +0 -0
  69. data/locale/ru/katello.edit.po +199 -192
  70. data/locale/ru/katello.po +136 -99
  71. data/locale/ta/LC_MESSAGES/katello.mo +0 -0
  72. data/locale/ta/katello.edit.po +199 -195
  73. data/locale/ta/katello.po +135 -99
  74. data/locale/te/LC_MESSAGES/katello.mo +0 -0
  75. data/locale/te/katello.edit.po +199 -195
  76. data/locale/te/katello.po +135 -99
  77. data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
  78. data/locale/zh_CN/katello.edit.po +199 -192
  79. data/locale/zh_CN/katello.po +136 -99
  80. data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
  81. data/locale/zh_TW/katello.edit.po +199 -192
  82. data/locale/zh_TW/katello.po +136 -100
  83. data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json +2 -2
  84. metadata +32 -10
Binary file
@@ -1444,7 +1444,7 @@ msgid "Invalid params provided - date_type must be one of %s"
1444
1444
  msgstr ""
1445
1445
 
1446
1446
  #: ../app/controllers/katello/api/v2/errata_controller.rb:65
1447
- msgid "Return errata that can be added to the Content View Version via an Incremental Update"
1447
+ msgid "Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."
1448
1448
  msgstr ""
1449
1449
 
1450
1450
  #: ../app/controllers/katello/api/v2/errata_controller.rb:89 ../app/controllers/katello/api/v2/packages_controller.rb:98
@@ -1628,8 +1628,8 @@ msgid "Host ID"
1628
1628
  msgstr ""
1629
1629
 
1630
1630
  #: ../app/controllers/katello/api/v2/host_errata_controller.rb:54
1631
- msgid "List of Errata ids to install"
1632
- msgstr "要安装的勘误列表"
1631
+ msgid "List of Errata ids to install. Will be removed in Katello 4.1."
1632
+ msgstr ""
1633
1633
 
1634
1634
  #: ../app/controllers/katello/api/v2/host_errata_controller.rb:62
1635
1635
  msgid "Retrieve a single errata for a host"
@@ -2101,123 +2101,123 @@ msgstr ""
2101
2101
  msgid "Medium IDs"
2102
2102
  msgstr ""
2103
2103
 
2104
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:25 ../app/controllers/katello/api/v2/organizations_controller.rb:27
2105
- msgid "Provisioning template IDs"
2104
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:25
2105
+ msgid "Partition template IDs"
2106
2106
  msgstr ""
2107
2107
 
2108
2108
  #: ../app/controllers/katello/api/v2/organizations_controller.rb:26
2109
- msgid "Partition template IDs"
2109
+ msgid "Provisioning template IDs"
2110
2110
  msgstr ""
2111
2111
 
2112
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:28
2112
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:27
2113
2113
  msgid "Domain IDs"
2114
2114
  msgstr ""
2115
2115
 
2116
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:29
2116
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:28
2117
2117
  msgid "Realm IDs"
2118
2118
  msgstr ""
2119
2119
 
2120
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:30
2120
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:29
2121
2121
  msgid "Host group IDs"
2122
2122
  msgstr ""
2123
2123
 
2124
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:31
2124
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:30
2125
2125
  msgid "Environment IDs"
2126
2126
  msgstr ""
2127
2127
 
2128
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:32
2128
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:31
2129
2129
  msgid "Subnet IDs"
2130
2130
  msgstr ""
2131
2131
 
2132
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:34
2132
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:33
2133
2133
  msgid "Associated location IDs"
2134
2134
  msgstr ""
2135
2135
 
2136
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:42
2136
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:41
2137
2137
  msgid "List all organizations"
2138
2138
  msgstr "列出所有机构"
2139
2139
 
2140
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:50
2140
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:49
2141
2141
  msgid "Show organization"
2142
2142
  msgstr "显示机构"
2143
2143
 
2144
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:51 ../app/controllers/katello/api/v2/organizations_controller.rb:58
2144
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:50 ../app/controllers/katello/api/v2/organizations_controller.rb:57
2145
2145
  msgid "organization ID"
2146
2146
  msgstr "机构 ID"
2147
2147
 
2148
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:57
2148
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:56
2149
2149
  msgid "Update organization"
2150
2150
  msgstr "更新机构"
2151
2151
 
2152
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:59 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:166
2152
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:58 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:169
2153
2153
  msgid "Red Hat CDN URL"
2154
2154
  msgstr "Red Hat CDN URL"
2155
2155
 
2156
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:69
2156
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:68
2157
2157
  msgid "Create organization"
2158
2158
  msgstr "创建机构"
2159
2159
 
2160
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:84
2160
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:83
2161
2161
  msgid "Delete an organization"
2162
2162
  msgstr "删除机构"
2163
2163
 
2164
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:85 ../app/controllers/katello/api/v2/organizations_controller.rb:92 ../app/controllers/katello/api/v2/products_controller.rb:90 ../app/controllers/katello/api/v2/repositories_controller.rb:265 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:20 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:28 ../app/controllers/katello/api/v2/subscriptions_controller.rb:24 ../app/controllers/katello/api/v2/subscriptions_controller.rb:128 ../app/controllers/katello/api/v2/sync_plans_controller.rb:23 ../app/controllers/katello/api/v2/sync_plans_controller.rb:43 ../app/controllers/katello/api/v2/sync_plans_controller.rb:50 ../app/controllers/katello/api/v2/sync_plans_controller.rb:67 ../app/controllers/katello/api/v2/sync_plans_controller.rb:84 ../app/controllers/katello/api/v2/sync_plans_controller.rb:91 ../app/controllers/katello/api/v2/sync_plans_controller.rb:102 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:20 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:37 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:49 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:62 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:89 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:97
2164
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:84 ../app/controllers/katello/api/v2/organizations_controller.rb:91 ../app/controllers/katello/api/v2/products_controller.rb:90 ../app/controllers/katello/api/v2/repositories_controller.rb:265 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:20 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:28 ../app/controllers/katello/api/v2/subscriptions_controller.rb:24 ../app/controllers/katello/api/v2/subscriptions_controller.rb:128 ../app/controllers/katello/api/v2/sync_plans_controller.rb:23 ../app/controllers/katello/api/v2/sync_plans_controller.rb:43 ../app/controllers/katello/api/v2/sync_plans_controller.rb:50 ../app/controllers/katello/api/v2/sync_plans_controller.rb:67 ../app/controllers/katello/api/v2/sync_plans_controller.rb:84 ../app/controllers/katello/api/v2/sync_plans_controller.rb:91 ../app/controllers/katello/api/v2/sync_plans_controller.rb:102 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:20 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:37 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:49 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:62 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:89 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:97
2165
2165
  msgid "Organization ID"
2166
2166
  msgstr "机构 ID"
2167
2167
 
2168
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:91
2168
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:90
2169
2169
  msgid "Discover Repositories"
2170
2170
  msgstr "查找库"
2171
2171
 
2172
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:93
2172
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:92
2173
2173
  msgid "Base URL to perform repo discovery on"
2174
2174
  msgstr ""
2175
2175
 
2176
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:94
2176
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:93
2177
2177
  msgid "One of yum or docker"
2178
2178
  msgstr ""
2179
2179
 
2180
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:95
2180
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:94
2181
2181
  msgid "Username to access URL"
2182
2182
  msgstr ""
2183
2183
 
2184
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:96
2184
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:95
2185
2185
  msgid "Password to access URL"
2186
2186
  msgstr ""
2187
2187
 
2188
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:97
2188
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:96
2189
2189
  msgid "Search pattern (defaults to '*')"
2190
2190
  msgstr ""
2191
2191
 
2192
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:99
2192
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:98
2193
2193
  msgid "url not defined."
2194
2194
  msgstr "未定义 url。"
2195
2195
 
2196
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:106
2196
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:105
2197
2197
  msgid "Cancel repository discovery"
2198
2198
  msgstr "取消查找库"
2199
2199
 
2200
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:107 ../app/controllers/katello/api/v2/organizations_controller.rb:115
2200
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:106 ../app/controllers/katello/api/v2/organizations_controller.rb:114
2201
2201
  msgid "Organization label"
2202
2202
  msgstr "机构标签"
2203
2203
 
2204
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:108
2204
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:107
2205
2205
  msgid "base url to perform repo discovery on"
2206
2206
  msgstr "中其中执行查找的基础 url"
2207
2207
 
2208
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:114
2208
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:113
2209
2209
  msgid "Download a debug certificate"
2210
2210
  msgstr "下载 debug 证书"
2211
2211
 
2212
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:124
2212
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:123
2213
2213
  msgid "List available releases in the organization"
2214
2214
  msgstr ""
2215
2215
 
2216
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:125
2216
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:124
2217
2217
  msgid "ID of the Organization"
2218
2218
  msgstr ""
2219
2219
 
2220
- #: ../app/controllers/katello/api/v2/organizations_controller.rb:136
2220
+ #: ../app/controllers/katello/api/v2/organizations_controller.rb:135
2221
2221
  msgid "List all :resource_id"
2222
2222
  msgstr "列出所有:resource_id"
2223
2223
 
@@ -3289,19 +3289,19 @@ msgstr "请求这个操作中发送的无效参数。请联络系统管理员。
3289
3289
  msgid "Invalid parameters sent. You may have mistyped the address. If you continue having trouble with this, please contact an Administrator."
3290
3290
  msgstr "发送无效参数。您可能是输错了地址。如果还有此类问题,请联络管理员。"
3291
3291
 
3292
- #: ../app/controllers/katello/concerns/api/v2/authorization.rb:42
3293
- msgid "Could not find %{name} resource with id %{id}"
3292
+ #: ../app/controllers/katello/concerns/api/v2/authorization.rb:44
3293
+ msgid "Could not find %{name} resource with id %{id}. %{perms_message}"
3294
3294
  msgstr ""
3295
3295
 
3296
- #: ../app/controllers/katello/concerns/api/v2/authorization.rb:51
3296
+ #: ../app/controllers/katello/concerns/api/v2/authorization.rb:64
3297
3297
  msgid "Could not find %{name} resources with ids %{ids}"
3298
3298
  msgstr ""
3299
3299
 
3300
- #: ../app/controllers/katello/concerns/api/v2/authorization.rb:63
3300
+ #: ../app/controllers/katello/concerns/api/v2/authorization.rb:76
3301
3301
  msgid "One or more ids (%{ids}) were not found for %{assoc}. You may not have permissions to see them."
3302
3302
  msgstr ""
3303
3303
 
3304
- #: ../app/controllers/katello/concerns/api/v2/authorization.rb:67
3304
+ #: ../app/controllers/katello/concerns/api/v2/authorization.rb:80
3305
3305
  msgid "Unfiltered params array: %s."
3306
3306
  msgstr ""
3307
3307
 
@@ -3526,15 +3526,15 @@ msgstr ""
3526
3526
  msgid "Organization %s is being deleted."
3527
3527
  msgstr "已删除机构 %s。"
3528
3528
 
3529
- #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:36
3529
+ #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:35
3530
3530
  msgid "Error connecting. Got: %s"
3531
3531
  msgstr ""
3532
3532
 
3533
- #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:38
3533
+ #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:37
3534
3534
  msgid "Error retrieving Pulp storage"
3535
3535
  msgstr ""
3536
3536
 
3537
- #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:49
3537
+ #: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:48
3538
3538
  msgid "Error connecting to Pulp service"
3539
3539
  msgstr ""
3540
3540
 
@@ -3568,19 +3568,19 @@ msgstr "Puppet 环境"
3568
3568
  msgid "Reset Puppet Environment"
3569
3569
  msgstr ""
3570
3570
 
3571
- #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:36
3571
+ #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:31
3572
3572
  msgid "On Demand"
3573
3573
  msgstr ""
3574
3574
 
3575
- #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:40
3575
+ #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:35
3576
3576
  msgid "Background"
3577
3577
  msgstr ""
3578
3578
 
3579
- #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:44
3579
+ #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:39
3580
3580
  msgid "Immediate"
3581
3581
  msgstr ""
3582
3582
 
3583
- #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:48
3583
+ #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:43
3584
3584
  msgid "Inherit from Repository"
3585
3585
  msgstr ""
3586
3586
 
@@ -3647,11 +3647,11 @@ msgid "The puppet environment %{name} is in use by %{count} Host Group(s) includ
3647
3647
  msgstr "puppet 环境 %{name} 已由 %{count} 主机组使用,其中包括 %{names}。"
3648
3648
 
3649
3649
  # translation auto-copied from project NetworkManager, version 0.9.9.0, document NetworkManager, author Leah Liu
3650
- #: ../app/lib/actions/katello/activation_key/create.rb:21 ../app/lib/actions/katello/content_view/create.rb:10 ../app/lib/actions/katello/content_view/environment_create.rb:16 ../app/lib/actions/katello/content_view_puppet_environment/create.rb:29 ../app/lib/actions/katello/environment/library_create.rb:24 ../app/lib/actions/katello/organization/create.rb:33 ../app/lib/actions/katello/repository/create.rb:50 ../app/lib/actions/katello/repository/create_root.rb:17 action_names.rb:21
3650
+ #: ../app/lib/actions/katello/activation_key/create.rb:21 ../app/lib/actions/katello/content_view/create.rb:10 ../app/lib/actions/katello/content_view/environment_create.rb:16 ../app/lib/actions/katello/content_view_puppet_environment/create.rb:29 ../app/lib/actions/katello/environment/library_create.rb:24 ../app/lib/actions/katello/organization/create.rb:33 ../app/lib/actions/katello/repository/create.rb:50 ../app/lib/actions/katello/repository/create_root.rb:17 action_names.rb:10
3651
3651
  msgid "Create"
3652
3652
  msgstr "创建"
3653
3653
 
3654
- #: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:41
3654
+ #: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:69
3655
3655
  msgid "Delete Activation Key"
3656
3656
  msgstr "删除激活码"
3657
3657
 
@@ -3671,7 +3671,7 @@ msgstr ""
3671
3671
  msgid "Host did not finish content action in %s seconds. The task has been cancelled."
3672
3672
  msgstr ""
3673
3673
 
3674
- #: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:40
3674
+ #: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:71
3675
3675
  msgid "Generate host applicability"
3676
3676
  msgstr ""
3677
3677
 
@@ -3679,15 +3679,15 @@ msgstr ""
3679
3679
  msgid "Content Facet for host with id %s is non-existent. Skipping applicability calculation."
3680
3680
  msgstr ""
3681
3681
 
3682
- #: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:39
3682
+ #: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:73
3683
3683
  msgid "Bulk generate applicability for hosts"
3684
3684
  msgstr ""
3685
3685
 
3686
- #: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:62
3686
+ #: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:2
3687
3687
  msgid "Generate repository applicability"
3688
3688
  msgstr ""
3689
3689
 
3690
- #: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:66
3690
+ #: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:3
3691
3691
  msgid "Synchronize smart proxy"
3692
3692
  msgstr ""
3693
3693
 
@@ -3700,7 +3700,7 @@ msgid "Sync Content View on Smart Proxy(ies)"
3700
3700
  msgstr ""
3701
3701
 
3702
3702
  # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery
3703
- #: ../app/lib/actions/katello/content_view/destroy.rb:34 ../app/lib/actions/katello/content_view_puppet_environment/destroy.rb:23 ../app/lib/actions/katello/content_view_puppet_module/destroy.rb:41 ../app/lib/actions/katello/provider/destroy.rb:19 ../app/lib/actions/katello/repository/destroy.rb:67 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:259 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:274 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:27 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:90 action_names.rb:32
3703
+ #: ../app/lib/actions/katello/content_view/destroy.rb:34 ../app/lib/actions/katello/content_view_puppet_environment/destroy.rb:23 ../app/lib/actions/katello/content_view_puppet_module/destroy.rb:41 ../app/lib/actions/katello/provider/destroy.rb:19 ../app/lib/actions/katello/repository/destroy.rb:67 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:262 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:277 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:27 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:90 action_names.rb:5
3704
3704
  msgid "Delete"
3705
3705
  msgstr "删除"
3706
3706
 
@@ -3756,7 +3756,7 @@ msgstr "已添加内容:"
3756
3756
  msgid "Cannot promote environment out of sequence. Use force to bypass restriction."
3757
3757
  msgstr "无法推广序列之外的环境。请使用 force 避免限制。"
3758
3758
 
3759
- #: ../app/lib/actions/katello/content_view/promote_to_environment.rb:43 action_names.rb:36
3759
+ #: ../app/lib/actions/katello/content_view/promote_to_environment.rb:43 action_names.rb:20
3760
3760
  msgid "Promotion to Environment"
3761
3761
  msgstr ""
3762
3762
 
@@ -3769,7 +3769,7 @@ msgid "Content view has repository label '%s' which is not specified in repos_un
3769
3769
  msgstr ""
3770
3770
 
3771
3771
  # translation auto-copied from project shotwell-core, version 0.14.1, document shotwell-core
3772
- #: ../app/lib/actions/katello/content_view/publish.rb:100 action_names.rb:35
3772
+ #: ../app/lib/actions/katello/content_view/publish.rb:100 action_names.rb:9
3773
3773
  msgid "Publish"
3774
3774
  msgstr "发布"
3775
3775
 
@@ -3781,7 +3781,7 @@ msgstr ""
3781
3781
  msgid "Cannot delete version while it is in environment %s"
3782
3782
  msgstr "因为它在环境 %s 中所以无法删除"
3783
3783
 
3784
- #: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:34
3784
+ #: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:28
3785
3785
  msgid "Remove Versions and Associations"
3786
3786
  msgstr "删除版本及关联"
3787
3787
 
@@ -3801,11 +3801,11 @@ msgstr "无法重新分配 activation_keys。请检查 activation_key_content_vi
3801
3801
  msgid "Cannot remove content view from environment. Content view '%{view}' is not in lifecycle environment '%{env}'."
3802
3802
  msgstr "无法从环境中删除内容视图。内容视图 '%{view}' 不是生命周期环境 '%{env}'。"
3803
3803
 
3804
- #: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:33
3804
+ #: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:23
3805
3805
  msgid "Remove from Environment"
3806
3806
  msgstr "从环境中删除 "
3807
3807
 
3808
- #: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:56
3808
+ #: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:24
3809
3809
  msgid "Remove Version"
3810
3810
  msgstr "删除版本"
3811
3811
 
@@ -3817,7 +3817,7 @@ msgstr ""
3817
3817
  msgid "Create Repositories"
3818
3818
  msgstr ""
3819
3819
 
3820
- #: ../app/lib/actions/katello/content_view_version/export.rb:27 ../app/lib/actions/katello/repository/export.rb:63 ../app/lib/actions/pulp3/orchestration/content_view_version/export.rb:93 action_names.rb:3
3820
+ #: ../app/lib/actions/katello/content_view_version/export.rb:27 ../app/lib/actions/katello/repository/export.rb:63 ../app/lib/actions/pulp3/orchestration/content_view_version/export.rb:93 action_names.rb:13
3821
3821
  msgid "Export"
3822
3822
  msgstr ""
3823
3823
 
@@ -3825,15 +3825,15 @@ msgstr ""
3825
3825
  msgid "This action will become available after the Pulp 3 content migration"
3826
3826
  msgstr ""
3827
3827
 
3828
- #: ../app/lib/actions/katello/content_view_version/import.rb:26 action_names.rb:31
3828
+ #: ../app/lib/actions/katello/content_view_version/import.rb:26 action_names.rb:14
3829
3829
  msgid "Import Content View Version"
3830
3830
  msgstr ""
3831
3831
 
3832
- #: ../app/lib/actions/katello/content_view_version/import_library.rb:12 action_names.rb:30
3832
+ #: ../app/lib/actions/katello/content_view_version/import_library.rb:12 action_names.rb:11
3833
3833
  msgid "Import Default Content View"
3834
3834
  msgstr ""
3835
3835
 
3836
- #: ../app/lib/actions/katello/content_view_version/incremental_update.rb:17 action_names.rb:28
3836
+ #: ../app/lib/actions/katello/content_view_version/incremental_update.rb:17 action_names.rb:12
3837
3837
  msgid "Incremental Update"
3838
3838
  msgstr "增量更新"
3839
3839
 
@@ -3861,15 +3861,15 @@ msgstr ""
3861
3861
  msgid "Republish Repositories of %{name} %{version}"
3862
3862
  msgstr ""
3863
3863
 
3864
- #: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:31 action_names.rb:29
3864
+ #: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:31 action_names.rb:17
3865
3865
  msgid "Republish Version Repositories"
3866
3866
  msgstr ""
3867
3867
 
3868
- #: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:57
3868
+ #: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:15
3869
3869
  msgid "Delete Lifecycle Environment"
3870
3870
  msgstr "删除生命周期环境"
3871
3871
 
3872
- #: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:27
3872
+ #: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:18
3873
3873
  msgid "Publish Lifecycle Environment Repositories"
3874
3874
  msgstr ""
3875
3875
 
@@ -3886,7 +3886,7 @@ msgstr "未知的"
3886
3886
  msgid "Attach subscriptions to %s"
3887
3887
  msgstr ""
3888
3888
 
3889
- #: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:26
3889
+ #: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:19
3890
3890
  msgid "Attach subscriptions"
3891
3891
  msgstr ""
3892
3892
 
@@ -3894,7 +3894,7 @@ msgstr ""
3894
3894
  msgid "Destroy Content Host %s"
3895
3895
  msgstr ""
3896
3896
 
3897
- #: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:68
3897
+ #: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:22
3898
3898
  msgid "Destroy Content Host"
3899
3899
  msgstr "消除内容主机"
3900
3900
 
@@ -3906,7 +3906,7 @@ msgstr ""
3906
3906
  msgid "No applicable errata for %s, skipping"
3907
3907
  msgstr ""
3908
3908
 
3909
- #: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:24
3909
+ #: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:25
3910
3910
  msgid "Install Applicable Errata"
3911
3911
  msgstr "安装可应用勘误"
3912
3912
 
@@ -3999,7 +3999,7 @@ msgstr ""
3999
3999
  msgid "Remove subscriptions from %s"
4000
4000
  msgstr ""
4001
4001
 
4002
- #: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:58
4002
+ #: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:33
4003
4003
  msgid "Remove subscriptions"
4004
4004
  msgstr ""
4005
4005
 
@@ -4011,7 +4011,7 @@ msgstr ""
4011
4011
  msgid "Update Content Overrides to %s"
4012
4012
  msgstr ""
4013
4013
 
4014
- #: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:52
4014
+ #: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:29
4015
4015
  msgid "Update Content Overrides"
4016
4016
  msgstr ""
4017
4017
 
@@ -4019,7 +4019,7 @@ msgstr ""
4019
4019
  msgid "Host %s has not been registered with subscription-manager."
4020
4020
  msgstr ""
4021
4021
 
4022
- #: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:49
4022
+ #: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:30
4023
4023
  msgid "Update for host"
4024
4024
  msgstr ""
4025
4025
 
@@ -4031,7 +4031,7 @@ msgstr ""
4031
4031
  msgid "Host %{name} cannot be assigned release version %{release_version}."
4032
4032
  msgstr ""
4033
4033
 
4034
- #: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:64
4034
+ #: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:31
4035
4035
  msgid "Update release version for host"
4036
4036
  msgstr ""
4037
4037
 
@@ -4043,7 +4043,7 @@ msgstr ""
4043
4043
  msgid "Updating System Purpose for host %s"
4044
4044
  msgstr ""
4045
4045
 
4046
- #: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:50
4046
+ #: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:32
4047
4047
  msgid "Updating System Purpose for host"
4048
4048
  msgstr ""
4049
4049
 
@@ -4051,7 +4051,7 @@ msgstr ""
4051
4051
  msgid "Package Profile Update for %s"
4052
4052
  msgstr ""
4053
4053
 
4054
- #: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:63
4054
+ #: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:61
4055
4055
  msgid "Package Profile Update"
4056
4056
  msgstr ""
4057
4057
 
@@ -4059,11 +4059,11 @@ msgstr ""
4059
4059
  msgid "Combined Profile Update for %s"
4060
4060
  msgstr ""
4061
4061
 
4062
- #: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:47
4062
+ #: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:34
4063
4063
  msgid "Combined Profile Update"
4064
4064
  msgstr ""
4065
4065
 
4066
- #: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:65
4066
+ #: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:35
4067
4067
  msgid "Destroy"
4068
4068
  msgstr "消除"
4069
4069
 
@@ -4104,7 +4104,7 @@ msgstr ""
4104
4104
  msgid "Cannot delete redhat product content"
4105
4105
  msgstr ""
4106
4106
 
4107
- #: ../app/lib/actions/katello/product/create.rb:38 action_names.rb:46
4107
+ #: ../app/lib/actions/katello/product/create.rb:38 action_names.rb:36
4108
4108
  msgid "Product Create"
4109
4109
  msgstr ""
4110
4110
 
@@ -4116,7 +4116,7 @@ msgstr ""
4116
4116
  msgid "Cannot delete product with repositories published in a content view. Product: %{product}, %{view_versions}"
4117
4117
  msgstr ""
4118
4118
 
4119
- #: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:53
4119
+ #: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:37
4120
4120
  msgid "Delete Product"
4121
4121
  msgstr "删除产品"
4122
4122
 
@@ -4133,7 +4133,7 @@ msgstr "可删除的 Red Hat 供应商"
4133
4133
  msgid "Cannot delete provider with attached products"
4134
4134
  msgstr "无法删除附带产品的供应商"
4135
4135
 
4136
- #: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:185 action_names.rb:5
4136
+ #: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:188 action_names.rb:8
4137
4137
  msgid "Update"
4138
4138
  msgstr "更新"
4139
4139
 
@@ -4149,7 +4149,7 @@ msgstr ""
4149
4149
  msgid "Cannot publish a link repository if multiple component clones are specified"
4150
4150
  msgstr ""
4151
4151
 
4152
- #: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:20
4152
+ #: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:40
4153
4153
  msgid "Delete Package Group"
4154
4154
  msgstr ""
4155
4155
 
@@ -4161,7 +4161,7 @@ msgstr ""
4161
4161
  msgid "Unable to export. 'pulp_export_destination' setting is not a writable directory."
4162
4162
  msgstr ""
4163
4163
 
4164
- #: ../app/lib/actions/katello/repository/import_upload.rb:60 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:8
4164
+ #: ../app/lib/actions/katello/repository/import_upload.rb:60 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:43
4165
4165
  msgid "Upload into"
4166
4166
  msgstr "上传到"
4167
4167
 
@@ -4173,7 +4173,7 @@ msgstr "无法从非自定义库中删除内容"
4173
4173
  msgid "Can only remove content from within the Default Content View"
4174
4174
  msgstr "无法从默认内容视图中删除内容"
4175
4175
 
4176
- #: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:12
4176
+ #: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:50
4177
4177
  msgid "Remove Content"
4178
4178
  msgstr "删除内容"
4179
4179
 
@@ -4197,20 +4197,20 @@ msgstr ""
4197
4197
  msgid "Synchronize: Skip Metadata Check"
4198
4198
  msgstr ""
4199
4199
 
4200
- #: ../app/lib/actions/katello/repository/sync.rb:98 action_names.rb:11
4200
+ #: ../app/lib/actions/katello/repository/sync.rb:98 action_names.rb:51
4201
4201
  msgid "Synchronize"
4202
4202
  msgstr "同步"
4203
4203
 
4204
- #: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:9
4204
+ #: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:55
4205
4205
  msgid "Upload errata into"
4206
4206
  msgstr ""
4207
4207
 
4208
- #: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:48
4208
+ #: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:56
4209
4209
  msgid "Create Package Group"
4210
4210
  msgstr ""
4211
4211
 
4212
4212
  # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery, author Leah Liu
4213
- #: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:51
4213
+ #: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:58
4214
4214
  msgid "Disable"
4215
4215
  msgstr "禁用"
4216
4216
 
@@ -4219,7 +4219,7 @@ msgid "Repository not found"
4219
4219
  msgstr "未找到库"
4220
4220
 
4221
4221
  # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery, author Leah Liu
4222
- #: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:6
4222
+ #: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:59
4223
4223
  msgid "Enable"
4224
4224
  msgstr "启用"
4225
4225
 
@@ -4227,7 +4227,7 @@ msgstr "启用"
4227
4227
  msgid "The repository is already enabled"
4228
4228
  msgstr "已启用该库"
4229
4229
 
4230
- #: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:69
4230
+ #: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:60
4231
4231
  msgid "Run Sync Plan:"
4232
4232
  msgstr ""
4233
4233
 
@@ -4291,7 +4291,7 @@ msgstr ""
4291
4291
  msgid "waiting for Pulp to finish the task"
4292
4292
  msgstr ""
4293
4293
 
4294
- #: ../app/lib/actions/pulp/consumer/destroy.rb:12 ../app/services/katello/registration_manager.rb:266
4294
+ #: ../app/lib/actions/pulp/consumer/destroy.rb:12 ../app/services/katello/registration_manager.rb:268
4295
4295
  msgid "Pulp Consumer %s has already been removed"
4296
4296
  msgstr ""
4297
4297
 
@@ -4400,11 +4400,15 @@ msgstr ""
4400
4400
  msgid "Content Migration"
4401
4401
  msgstr ""
4402
4402
 
4403
+ #: ../app/lib/actions/pulp3/content_migration_reset.rb:14
4404
+ msgid "Content Migration Reset"
4405
+ msgstr ""
4406
+
4403
4407
  #: ../app/lib/actions/pulp3/orchestration/content_view_version/export.rb:27
4404
4408
  msgid "Unable to export. 'pulpcore_export_destination' setting is not set to a valid directory."
4405
4409
  msgstr ""
4406
4410
 
4407
- #: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:2
4411
+ #: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:63
4408
4412
  msgid "Export Library"
4409
4413
  msgstr ""
4410
4414
 
@@ -4414,7 +4418,7 @@ msgid ""
4414
4418
  " %{repos}"
4415
4419
  msgstr ""
4416
4420
 
4417
- #: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:37 action_names.rb:72
4421
+ #: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:37 action_names.rb:64
4418
4422
  msgid "Import"
4419
4423
  msgstr ""
4420
4424
 
@@ -5327,7 +5331,7 @@ msgstr "您不能设置机构的上级机构。这个功能已被禁用。"
5327
5331
  msgid "You cannot set an organization's parent_id. This feature is disabled."
5328
5332
  msgstr "您不能设置机构的 parent_id.。这个功能已被禁用。"
5329
5333
 
5330
- #: ../app/models/katello/concerns/smart_proxy_extensions.rb:60 ../app/models/katello/content_view_erratum_filter_rule.rb:26 ../app/models/katello/root_repository.rb:85 ../app/models/katello/root_repository.rb:89 ../app/models/katello/root_repository.rb:93
5334
+ #: ../app/models/katello/concerns/smart_proxy_extensions.rb:60 ../app/models/katello/content_view_erratum_filter_rule.rb:26 ../app/models/katello/content_view_version_export_history.rb:17 ../app/models/katello/root_repository.rb:85 ../app/models/katello/root_repository.rb:89 ../app/models/katello/root_repository.rb:93
5331
5335
  msgid "must be one of the following: %s"
5332
5336
  msgstr "必须为以下之一:%s"
5333
5337
 
@@ -5335,15 +5339,15 @@ msgstr "必须为以下之一:%s"
5335
5339
  msgid "Could not find a smart proxy with pulp feature."
5336
5340
  msgstr ""
5337
5341
 
5338
- #: ../app/models/katello/concerns/smart_proxy_extensions.rb:299
5342
+ #: ../app/models/katello/concerns/smart_proxy_extensions.rb:327
5339
5343
  msgid "Could not remove the lifecycle environment from the smart proxy"
5340
5344
  msgstr ""
5341
5345
 
5342
- #: ../app/models/katello/concerns/smart_proxy_extensions.rb:302
5346
+ #: ../app/models/katello/concerns/smart_proxy_extensions.rb:330
5343
5347
  msgid "Lifecycle environment was not attached to the smart proxy; therefore, no changes were made."
5344
5348
  msgstr ""
5345
5349
 
5346
- #: ../app/models/katello/concerns/smart_proxy_extensions.rb:340 ../app/models/katello/concerns/smart_proxy_extensions.rb:346
5350
+ #: ../app/models/katello/concerns/smart_proxy_extensions.rb:368 ../app/models/katello/concerns/smart_proxy_extensions.rb:374
5347
5351
  msgid "%s is unreachable. %s"
5348
5352
  msgstr ""
5349
5353
 
@@ -5605,10 +5609,6 @@ msgstr ""
5605
5609
  msgid "Cannot add composite versions to another composite content view"
5606
5610
  msgstr "无法在另一个综合内容视图中添加综合版本"
5607
5611
 
5608
- #: ../app/models/katello/content_view_version_export_history.rb:15
5609
- msgid "Invalid export_type from one of the following: %s"
5610
- msgstr ""
5611
-
5612
5612
  #: ../app/models/katello/errata_status.rb:27
5613
5613
  msgid "Security errata installable"
5614
5614
  msgstr ""
@@ -5730,43 +5730,43 @@ msgstr "生命周期环境 %s 有关联的激活码。请在尝试删除这个
5730
5730
  msgid "Lifecycle Environment"
5731
5731
  msgstr "生命周期环境"
5732
5732
 
5733
- #: ../app/models/katello/ping.rb:63
5733
+ #: ../app/models/katello/ping.rb:55
5734
5734
  msgid "Not running"
5735
5735
  msgstr ""
5736
5736
 
5737
- #: ../app/models/katello/ping.rb:113
5737
+ #: ../app/models/katello/ping.rb:105
5738
5738
  msgid "Skipped pulp_auth check after failed pulp check"
5739
5739
  msgstr ""
5740
5740
 
5741
- #: ../app/models/katello/ping.rb:131
5741
+ #: ../app/models/katello/ping.rb:123
5742
5742
  msgid "foreman-tasks service not running or is not ready yet"
5743
5743
  msgstr ""
5744
5744
 
5745
- #: ../app/models/katello/ping.rb:137
5745
+ #: ../app/models/katello/ping.rb:129
5746
5746
  msgid "some executors are not responding, check %{status_url}"
5747
5747
  msgstr ""
5748
5748
 
5749
- #: ../app/models/katello/ping.rb:144
5749
+ #: ../app/models/katello/ping.rb:136
5750
5750
  msgid "Candlepin is not running properly"
5751
5751
  msgstr ""
5752
5752
 
5753
- #: ../app/models/katello/ping.rb:182 ../app/models/katello/ping.rb:201
5753
+ #: ../app/models/katello/ping.rb:174 ../app/models/katello/ping.rb:193
5754
5754
  msgid "Pulp does not appear to be running at %s."
5755
5755
  msgstr ""
5756
5756
 
5757
- #: ../app/models/katello/ping.rb:185 ../app/models/katello/ping.rb:204
5757
+ #: ../app/models/katello/ping.rb:177 ../app/models/katello/ping.rb:196
5758
5758
  msgid "Pulp database connection issue at %s."
5759
5759
  msgstr ""
5760
5760
 
5761
- #: ../app/models/katello/ping.rb:189
5761
+ #: ../app/models/katello/ping.rb:181
5762
5762
  msgid "Pulp message bus connection issue at %s."
5763
5763
  msgstr ""
5764
5764
 
5765
- #: ../app/models/katello/ping.rb:193 ../app/models/katello/ping.rb:215
5765
+ #: ../app/models/katello/ping.rb:185 ../app/models/katello/ping.rb:207
5766
5766
  msgid "Not all necessary pulp workers running at %s."
5767
5767
  msgstr ""
5768
5768
 
5769
- #: ../app/models/katello/ping.rb:208
5769
+ #: ../app/models/katello/ping.rb:200
5770
5770
  msgid "Pulp redis connection issue at %s."
5771
5771
  msgstr ""
5772
5772
 
@@ -6549,23 +6549,23 @@ msgstr ""
6549
6549
  msgid "Pulp 3 migration cannot run. Types %s have already been migrated."
6550
6550
  msgstr ""
6551
6551
 
6552
- #: ../app/services/katello/registration_manager.rb:144
6552
+ #: ../app/services/katello/registration_manager.rb:146
6553
6553
  msgid "Content View and Environment not set for registration."
6554
6554
  msgstr ""
6555
6555
 
6556
- #: ../app/services/katello/registration_manager.rb:237
6556
+ #: ../app/services/katello/registration_manager.rb:239
6557
6557
  msgid "Host collection '%{name}' exceeds maximum usage limit of '%{limit}'"
6558
6558
  msgstr "主机集合 '%{name}' 超过上限 '%{limit}'"
6559
6559
 
6560
- #: ../app/services/katello/registration_manager.rb:251
6560
+ #: ../app/services/katello/registration_manager.rb:253
6561
6561
  msgid "At least one activation key must have a lifecycle environment and content view assigned to it"
6562
6562
  msgstr "必须至少为每个激活码分配一个生命周期环境和内容视图"
6563
6563
 
6564
- #: ../app/services/katello/registration_manager.rb:258
6564
+ #: ../app/services/katello/registration_manager.rb:260
6565
6565
  msgid "Attempted to destroy consumer %s from candlepin, but consumer does not exist in candlepin"
6566
6566
  msgstr ""
6567
6567
 
6568
- #: ../app/services/katello/registration_manager.rb:260
6568
+ #: ../app/services/katello/registration_manager.rb:262
6569
6569
  msgid "Candlepin consumer %s has already been removed"
6570
6570
  msgstr ""
6571
6571
 
@@ -6925,7 +6925,7 @@ msgid "Synchronize Now"
6925
6925
  msgstr "现在同步"
6926
6926
 
6927
6927
  # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery
6928
- #: ../app/views/katello/sync_management/index.html.erb:5 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:271 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:147 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:30 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UnsavedChangesDialog.js:15 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js:41
6928
+ #: ../app/views/katello/sync_management/index.html.erb:5 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:274 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:147 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:30 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UnsavedChangesDialog.js:15 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js:41
6929
6929
  msgid "Cancel"
6930
6930
  msgstr "取消"
6931
6931
 
@@ -7052,15 +7052,15 @@ msgstr "嵌套"
7052
7052
  msgid "Clone"
7053
7053
  msgstr "克隆"
7054
7054
 
7055
- #: ../app/views/smart_proxies/_disk_usage.html.erb:7
7055
+ #: ../app/views/smart_proxies/_disk_usage.html.erb:8
7056
7056
  msgid "%s Used"
7057
7057
  msgstr ""
7058
7058
 
7059
- #: ../app/views/smart_proxies/_disk_usage.html.erb:8
7059
+ #: ../app/views/smart_proxies/_disk_usage.html.erb:9
7060
7060
  msgid "%{used} of %{total}"
7061
7061
  msgstr ""
7062
7062
 
7063
- #: ../app/views/smart_proxies/_disk_usage.html.erb:10 ../app/views/smart_proxies/_disk_usage.html.erb:11
7063
+ #: ../app/views/smart_proxies/_disk_usage.html.erb:12 ../app/views/smart_proxies/_disk_usage.html.erb:13
7064
7064
  msgid "%s Available"
7065
7065
  msgstr ""
7066
7066
 
@@ -7329,7 +7329,7 @@ msgstr ""
7329
7329
  msgid "No Content found"
7330
7330
  msgstr ""
7331
7331
 
7332
- #: ../webpack/components/Content/ContentTable.js:20 ../webpack/components/Content/Details/ContentDetails.js:37 ../webpack/components/LoadingState/LoadingState.js:44 ../webpack/components/SelectOrg/SetOrganization.js:49 ../webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js:59 ../webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js:83 ../webpack/scenes/Subscriptions/Details/SubscriptionDetails.js:83 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:289 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:239 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js:185
7332
+ #: ../webpack/components/Content/ContentTable.js:20 ../webpack/components/Content/Details/ContentDetails.js:37 ../webpack/components/LoadingState/LoadingState.js:44 ../webpack/components/SelectOrg/SetOrganization.js:49 ../webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js:59 ../webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js:83 ../webpack/scenes/Subscriptions/Details/SubscriptionDetails.js:83 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:292 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:239 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js:185
7333
7333
  msgid "Loading"
7334
7334
  msgstr ""
7335
7335
 
@@ -7880,71 +7880,71 @@ msgstr ""
7880
7880
  msgid "Disable Red Hat Insights."
7881
7881
  msgstr ""
7882
7882
 
7883
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:81
7883
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:84
7884
7884
  msgid "This is disabled because a manifest task is in progress"
7885
7885
  msgstr ""
7886
7886
 
7887
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:83
7887
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:86
7888
7888
  msgid "This is disabled because no manifest exists"
7889
7889
  msgstr ""
7890
7890
 
7891
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:118
7891
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:121
7892
7892
  msgid "There is no Manifest History to display."
7893
7893
  msgstr ""
7894
7894
 
7895
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:119
7895
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:122
7896
7896
  msgid "Import a Manifest using the manifest tab above."
7897
7897
  msgstr ""
7898
7898
 
7899
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:121
7899
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:124
7900
7900
  msgid "Learn more about adding Subscription Manifests"
7901
7901
  msgstr ""
7902
7902
 
7903
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:127
7903
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:130
7904
7904
  msgid "Updating..."
7905
7905
  msgstr ""
7906
7906
 
7907
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:131
7907
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:134
7908
7908
  msgid "No Manifest Uploaded"
7909
7909
  msgstr ""
7910
7910
 
7911
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:152 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:74
7911
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:155 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:74
7912
7912
  msgid "Manage Manifest"
7913
7913
  msgstr ""
7914
7914
 
7915
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:155
7915
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:158
7916
7916
  msgid "Manifest"
7917
7917
  msgstr ""
7918
7918
 
7919
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:159
7919
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:162
7920
7920
  msgid "Red Hat Provider Details"
7921
7921
  msgstr ""
7922
7922
 
7923
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:199
7923
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:202
7924
7924
  msgid "Subscription Manifest"
7925
7925
  msgstr ""
7926
7926
 
7927
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:214
7927
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:217
7928
7928
  msgid "Subscription Allocation"
7929
7929
  msgstr ""
7930
7930
 
7931
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:226
7931
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:229
7932
7932
  msgid "Import New Manifest"
7933
7933
  msgstr ""
7934
7934
 
7935
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:248
7935
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:251
7936
7936
  msgid "Refresh"
7937
7937
  msgstr ""
7938
7938
 
7939
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:267
7939
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:270
7940
7940
  msgid "Confirm delete manifest"
7941
7941
  msgstr ""
7942
7942
 
7943
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:288
7943
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:291
7944
7944
  msgid "Manifest History"
7945
7945
  msgstr ""
7946
7946
 
7947
- #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:300
7947
+ #: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:303
7948
7948
  msgid "Close"
7949
7949
  msgstr ""
7950
7950
 
@@ -8147,112 +8147,116 @@ msgid "The subscription is no longer available"
8147
8147
  msgstr ""
8148
8148
 
8149
8149
  #: action_names.rb:4
8150
- msgid "Copy version units to library"
8150
+ msgid "Sync capsule"
8151
8151
  msgstr ""
8152
8152
 
8153
+ #: action_names.rb:6
8154
+ msgid "Errata mail"
8155
+ msgstr "勘误邮件"
8156
+
8153
8157
  #: action_names.rb:7
8154
- msgid "Verify checksum"
8158
+ msgid "Incremental Update of Content View Version(s) "
8155
8159
  msgstr ""
8156
8160
 
8157
- #: action_names.rb:10
8158
- msgid "Update content urls"
8161
+ #: action_names.rb:16
8162
+ msgid "Promote"
8159
8163
  msgstr ""
8160
8164
 
8161
- #: action_names.rb:13
8162
- msgid "Index package groups"
8163
- msgstr ""
8165
+ #: action_names.rb:21
8166
+ msgid "Auto attach subscriptions"
8167
+ msgstr "自动附加订阅"
8164
8168
 
8165
- #: action_names.rb:14
8166
- msgid "Instance update"
8169
+ #: action_names.rb:26
8170
+ msgid "Hypervisors"
8167
8171
  msgstr ""
8168
8172
 
8169
- #: action_names.rb:15
8170
- msgid "Index errata"
8171
- msgstr "索引勘误"
8173
+ #: action_names.rb:27
8174
+ msgid "Hypervisors update"
8175
+ msgstr ""
8172
8176
 
8173
- #: action_names.rb:16
8174
- msgid "Index module streams"
8177
+ #: action_names.rb:38
8178
+ msgid "Reindex subscriptions"
8175
8179
  msgstr ""
8176
8180
 
8177
- #: action_names.rb:17
8178
- msgid "Index content"
8181
+ #: action_names.rb:39
8182
+ msgid "Update http proxy"
8179
8183
  msgstr ""
8180
8184
 
8181
- #: action_names.rb:18
8182
- msgid "Filtered index content"
8185
+ #: action_names.rb:41
8186
+ msgid "Discover"
8183
8187
  msgstr ""
8184
8188
 
8185
- #: action_names.rb:19
8186
- msgid "Errata mail"
8187
- msgstr "勘误邮件"
8189
+ #: action_names.rb:42
8190
+ msgid "Fetch pxe files"
8191
+ msgstr ""
8188
8192
 
8189
- #: action_names.rb:22
8190
- msgid "Hypervisors update"
8193
+ #: action_names.rb:44
8194
+ msgid "Filtered index content"
8191
8195
  msgstr ""
8192
8196
 
8193
- #: action_names.rb:23
8194
- msgid "Hypervisors"
8197
+ #: action_names.rb:45
8198
+ msgid "Index content"
8195
8199
  msgstr ""
8196
8200
 
8197
- #: action_names.rb:25
8198
- msgid "Auto attach subscriptions"
8199
- msgstr "自动附加订阅"
8201
+ #: action_names.rb:46
8202
+ msgid "Index errata"
8203
+ msgstr "索引勘误"
8200
8204
 
8201
- #: action_names.rb:37
8202
- msgid "Promote"
8205
+ #: action_names.rb:47
8206
+ msgid "Index module streams"
8203
8207
  msgstr ""
8204
8208
 
8205
- #: action_names.rb:38
8206
- msgid "Incremental Update of Content View Version(s) "
8209
+ #: action_names.rb:48
8210
+ msgid "Index package groups"
8207
8211
  msgstr ""
8208
8212
 
8209
- #: action_names.rb:42
8210
- msgid "Abstract async task"
8211
- msgstr "提取 async 任务"
8212
-
8213
- #: action_names.rb:43
8214
- msgid "Import facts"
8215
- msgstr "导入详情"
8213
+ #: action_names.rb:49
8214
+ msgid "Instance update"
8215
+ msgstr ""
8216
8216
 
8217
- #: action_names.rb:44
8218
- msgid "Update http proxy"
8217
+ #: action_names.rb:52
8218
+ msgid "Update content urls"
8219
8219
  msgstr ""
8220
8220
 
8221
- #: action_names.rb:45
8222
- msgid "Reindex subscriptions"
8221
+ #: action_names.rb:53
8222
+ msgid "Update http proxy details"
8223
8223
  msgstr ""
8224
8224
 
8225
8225
  #: action_names.rb:54
8226
- msgid "Discover"
8226
+ msgid "Update redhat repository"
8227
8227
  msgstr ""
8228
8228
 
8229
- #: action_names.rb:55
8230
- msgid "Agent action"
8229
+ #: action_names.rb:57
8230
+ msgid "Verify checksum"
8231
8231
  msgstr ""
8232
8232
 
8233
- #: action_names.rb:59
8234
- msgid "Fetch pxe files"
8233
+ #: action_names.rb:62
8234
+ msgid "Copy version units to library"
8235
8235
  msgstr ""
8236
8236
 
8237
- #: action_names.rb:60
8238
- msgid "Action with sub plans"
8237
+ #: action_names.rb:65
8238
+ msgid "Remote action:"
8239
8239
  msgstr ""
8240
8240
 
8241
- #: action_names.rb:61
8241
+ #: action_names.rb:66
8242
8242
  msgid "Import Puppet classes"
8243
8243
  msgstr ""
8244
8244
 
8245
8245
  #: action_names.rb:67
8246
- msgid "Sync capsule"
8246
+ msgid "Action with sub plans"
8247
8247
  msgstr ""
8248
8248
 
8249
+ #: action_names.rb:68
8250
+ msgid "Abstract async task"
8251
+ msgstr "提取 async 任务"
8252
+
8249
8253
  #: action_names.rb:70
8250
- msgid "Update http proxy details"
8254
+ msgid "Agent action"
8251
8255
  msgstr ""
8252
8256
 
8253
- #: action_names.rb:71
8254
- msgid "Update redhat repository"
8255
- msgstr ""
8257
+ #: action_names.rb:72
8258
+ msgid "Import facts"
8259
+ msgstr "导入详情"
8256
8260
 
8257
8261
  #~ msgid "Couldn't find GPG key '%s'"
8258
8262
  #~ msgstr "无法找到 GPG 密钥 '%s'"
@@ -8266,6 +8270,9 @@ msgstr ""
8266
8270
  #~ msgid "List gpg keys"
8267
8271
  #~ msgstr "列出 gpg 密钥"
8268
8272
 
8273
+ #~ msgid "List of Errata ids to install"
8274
+ #~ msgstr "要安装的勘误列表"
8275
+
8269
8276
  #~ msgid "Show a gpg key"
8270
8277
  #~ msgstr "显示 gpg 密钥"
8271
8278