locale/en/katello.edit.po in katello-4.0.3 vs locale/en/katello.edit.po in katello-4.1.0.rc1

@@ -3,11 +3,11 @@
 # This file is distributed under the same license as the version package.
 # Jason E. Rist <[e-mail]>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: katello 2.4.0-RC1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2011-01-06 19:28-0700\n"
 "Last-Translator: Jason E. Rist <[e-mail]>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -22,11 +22,11 @@
 
 #: ../app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb:24
 msgid "UUID of the consumer"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb:39 ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:305
+#: ../app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb:39 ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:298
 msgid "Couldn't find consumer '%s'"
 msgstr ""
 
 #: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:152
 msgid "Update services requiring restart"
@@ -54,59 +54,59 @@
 
 #: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:220
 msgid "Deleted consumer '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:261
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:254
 msgid "Facts successfully updated."
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:321
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:314
 msgid "User '%s' did not specify an organization ID and does not have a default organization."
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:346
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:339
 msgid "Couldn't find Organization '%s'."
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:351
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:344
 msgid "User '%{user}' does not belong to Organization '%{organization}'."
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:370
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:363
 msgid "Organization not found"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:374
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:367
 msgid "Couldn't find activation key '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:377
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:370
 msgid "Max Hosts (%{limit}) reached for activation key '%{name}'"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:386
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:379
 msgid "At least one activation key must be provided"
 msgstr ""
 
-#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:395 ../app/controllers/katello/api/v2/activation_keys_controller.rb:280
+#: ../app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb:388 ../app/controllers/katello/api/v2/activation_keys_controller.rb:266
 msgid "Couldn't find environment '%s'"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/activation_keys_controller.rb:17
 msgid "List activation keys"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:20 ../app/controllers/katello/api/v2/activation_keys_controller.rb:32 ../app/controllers/katello/api/v2/activation_keys_controller.rb:60 ../app/controllers/katello/api/v2/activation_keys_controller.rb:88 ../app/controllers/katello/api/v2/activation_keys_controller.rb:96 ../app/controllers/katello/api/v2/content_views_controller.rb:40 ../app/controllers/katello/api/v2/environments_controller.rb:48 ../app/controllers/katello/api/v2/environments_controller.rb:123 ../app/controllers/katello/api/v2/environments_controller.rb:132 ../app/controllers/katello/api/v2/host_collections_controller.rb:29 ../app/controllers/katello/api/v2/host_collections_controller.rb:38 ../app/controllers/katello/api/v2/host_collections_controller.rb:73 ../app/controllers/katello/api/v2/repository_sets_controller.rb:24 ../app/controllers/katello/api/v2/repository_sets_controller.rb:36 ../app/controllers/katello/api/v2/repository_sets_controller.rb:45 ../app/controllers/katello/api/v2/repository_sets_controller.rb:82 ../app/controllers/katello/api/v2/repository_sets_controller.rb:94 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:23 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:39
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:20 ../app/controllers/katello/api/v2/activation_keys_controller.rb:32 ../app/controllers/katello/api/v2/activation_keys_controller.rb:60 ../app/controllers/katello/api/v2/activation_keys_controller.rb:88 ../app/controllers/katello/api/v2/activation_keys_controller.rb:96 ../app/controllers/katello/api/v2/content_views_controller.rb:36 ../app/controllers/katello/api/v2/environments_controller.rb:48 ../app/controllers/katello/api/v2/environments_controller.rb:123 ../app/controllers/katello/api/v2/environments_controller.rb:132 ../app/controllers/katello/api/v2/host_collections_controller.rb:29 ../app/controllers/katello/api/v2/host_collections_controller.rb:38 ../app/controllers/katello/api/v2/host_collections_controller.rb:73 ../app/controllers/katello/api/v2/repository_sets_controller.rb:27 ../app/controllers/katello/api/v2/repository_sets_controller.rb:47 ../app/controllers/katello/api/v2/repository_sets_controller.rb:56 ../app/controllers/katello/api/v2/repository_sets_controller.rb:93 ../app/controllers/katello/api/v2/repository_sets_controller.rb:105 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:24 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:41
 msgid "organization identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:21 ../app/controllers/katello/api/v2/content_views_controller.rb:41 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:28
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:21 ../app/controllers/katello/api/v2/content_views_controller.rb:37 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:29
 msgid "environment identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:22 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:13 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:35 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:52 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:60 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:78 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:9 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:21 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:40 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:52
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:22 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:13 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:35 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:52 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:60 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:78
 msgid "content view identifier"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/activation_keys_controller.rb:23
 msgid "activation key name to filter by"
@@ -166,11 +166,11 @@
 
 #: ../app/controllers/katello/api/v2/activation_keys_controller.rb:58
 msgid "Update an activation key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:59 ../app/controllers/katello/api/v2/activation_keys_controller.rb:79 ../app/controllers/katello/api/v2/activation_keys_controller.rb:87 ../app/controllers/katello/api/v2/activation_keys_controller.rb:95 ../app/controllers/katello/api/v2/activation_keys_controller.rb:134 ../app/controllers/katello/api/v2/activation_keys_controller.rb:145 ../app/controllers/katello/api/v2/activation_keys_controller.rb:168 ../app/controllers/katello/api/v2/activation_keys_controller.rb:178 ../app/controllers/katello/api/v2/activation_keys_controller.rb:188 ../app/controllers/katello/api/v2/activation_keys_controller.rb:206 ../app/controllers/katello/api/v2/activation_keys_controller.rb:222
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:59 ../app/controllers/katello/api/v2/activation_keys_controller.rb:79 ../app/controllers/katello/api/v2/activation_keys_controller.rb:87 ../app/controllers/katello/api/v2/activation_keys_controller.rb:95 ../app/controllers/katello/api/v2/activation_keys_controller.rb:134 ../app/controllers/katello/api/v2/activation_keys_controller.rb:145 ../app/controllers/katello/api/v2/activation_keys_controller.rb:155 ../app/controllers/katello/api/v2/activation_keys_controller.rb:165 ../app/controllers/katello/api/v2/activation_keys_controller.rb:183 ../app/controllers/katello/api/v2/activation_keys_controller.rb:199 ../app/controllers/katello/api/v2/activation_keys_controller.rb:229
 msgid "ID of the activation key"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/activation_keys_controller.rb:78
 msgid "Destroy an activation key"
@@ -202,99 +202,99 @@
 
 #: ../app/controllers/katello/api/v2/activation_keys_controller.rb:133
 msgid "Show release versions available for an activation key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:144
-msgid "Show content available for an activation key"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:146 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:171
-msgid "Get all content available, not just that provided by subscriptions"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:147
-msgid "Limit content to just that available in the activation key's content view version"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:169
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:146
 msgid "List of host collection IDs to associate with activation key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:179
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:156
 msgid "List of host collection IDs to disassociate from the activation key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:187
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:164
 msgid "Attach a subscription"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:189 ../app/controllers/katello/api/v2/subscriptions_controller.rb:75
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:166 ../app/controllers/katello/api/v2/subscriptions_controller.rb:81
 msgid "Subscription identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:190
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:167
 msgid "Quantity of this subscription to add"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:191 ../app/controllers/katello/api/v2/activation_keys_controller.rb:208 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:133 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:175
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:168 ../app/controllers/katello/api/v2/activation_keys_controller.rb:185 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:133 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:175
 msgid "Array of subscriptions to add"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:192 ../app/controllers/katello/api/v2/activation_keys_controller.rb:209
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:169 ../app/controllers/katello/api/v2/activation_keys_controller.rb:186
 msgid "Subscription Pool uuid"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:193 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:135 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:177
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:170 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:135 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:177
 msgid "Quantity of this subscriptions to add"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:205
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:182
 msgid "Unattach a subscription"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:207
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:184
 msgid "Subscription ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:221
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:198
 msgid "Override content for activation_key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:223
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:200
 msgid "Array of Content override parameters to be added in bulk"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:224 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:154 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:202
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:201 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:163 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:202
 msgid "Label of the content"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:225 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:155 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:203
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:202 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:164 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:203
 msgid "Override value. Provide a boolean value if name is 'enabled'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:226
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:203
 msgid "Override parameter key or name. Note if name is not provided the default name will be 'enabled'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:227 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:157 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:205
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:204 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:166 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:205
 msgid "Set true to remove an override and reset it to 'default'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:291
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:228
+msgid "Show content available for an activation key"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:230 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:152
+msgid "Get all content available, not just that provided by subscriptions"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:231
+msgid "Limit content to just that available in the activation key's content view version"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:277
 msgid "Couldn't find host collection '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:298
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:284
 msgid "Either organization ID or environment ID needs to be specified"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:305
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:291
 msgid "Couldn't find content view '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:351 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:181
+#: ../app/controllers/katello/api/v2/activation_keys_controller.rb:337 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:181
 msgid "The specified organization is in Simple Content Access mode. Attaching subscriptions is disabled"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/ansible_collections_controller.rb:6
 msgid "an ansible collection"
@@ -334,31 +334,35 @@
 
 #: ../app/controllers/katello/api/v2/api_controller.rb:33
 msgid "root-node of collection contained in responses (default: 'results')"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:107
+#: ../app/controllers/katello/api/v2/api_controller.rb:48
+msgid "This action uses katello-agent, which is currently disabled. Use remote execution instead."
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/api_controller.rb:119
 msgid "Your search query was invalid. Please revise it and try again. The full error has been sent to the application logs."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:142
+#: ../app/controllers/katello/api/v2/api_controller.rb:154
 msgid "One of parameters [ %s ] required but not specified."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:160
+#: ../app/controllers/katello/api/v2/api_controller.rb:172
 msgid "Couldn't find organization '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:193
+#: ../app/controllers/katello/api/v2/api_controller.rb:205
 msgid "You have not set a default organization on the user %s."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:205
+#: ../app/controllers/katello/api/v2/api_controller.rb:217
 msgid "The requested resource does not belong to the specified Organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/api_controller.rb:211
+#: ../app/controllers/katello/api/v2/api_controller.rb:223
 msgid "Host has not been registered with subscription-manager"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/capsule_content_controller.rb:13 ../app/controllers/katello/api/v2/capsule_content_controller.rb:18 ../app/controllers/katello/api/v2/capsule_content_controller.rb:52 ../app/controllers/katello/api/v2/capsule_content_controller.rb:66 ../app/controllers/katello/api/v2/capsule_content_controller.rb:73
 msgid "Id of the smart proxy"
@@ -438,11 +442,11 @@
 
 #: ../app/controllers/katello/api/v2/content_credentials_controller.rb:28
 msgid "List Content Credentials"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_credentials_controller.rb:29 ../app/controllers/katello/api/v2/content_credentials_controller.rb:45 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:30 ../app/controllers/katello/api/v2/content_exports_controller.rb:11 ../app/controllers/katello/api/v2/content_exports_controller.rb:53 ../app/controllers/katello/api/v2/content_imports_controller.rb:22 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:25 ../app/controllers/katello/api/v2/content_views_controller.rb:69 ../app/controllers/katello/api/v2/errata_controller.rb:12 ../app/controllers/katello/api/v2/errata_controller.rb:67 ../app/controllers/katello/api/v2/packages_controller.rb:33 ../app/controllers/katello/api/v2/srpms_controller.rb:7 ../app/controllers/katello/api/v2/subscriptions_controller.rb:74
+#: ../app/controllers/katello/api/v2/content_credentials_controller.rb:29 ../app/controllers/katello/api/v2/content_credentials_controller.rb:45 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:29 ../app/controllers/katello/api/v2/content_exports_controller.rb:10 ../app/controllers/katello/api/v2/content_exports_controller.rb:46 ../app/controllers/katello/api/v2/content_imports_controller.rb:12 ../app/controllers/katello/api/v2/content_imports_controller.rb:31 ../app/controllers/katello/api/v2/content_imports_controller.rb:41 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:22 ../app/controllers/katello/api/v2/content_views_controller.rb:65 ../app/controllers/katello/api/v2/errata_controller.rb:12 ../app/controllers/katello/api/v2/errata_controller.rb:67 ../app/controllers/katello/api/v2/packages_controller.rb:33 ../app/controllers/katello/api/v2/srpms_controller.rb:7 ../app/controllers/katello/api/v2/subscriptions_controller.rb:80
 msgid "Organization identifier"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_credentials_controller.rb:31
 msgid "Type of content"
@@ -482,104 +486,108 @@
 
 #: ../app/controllers/katello/api/v2/content_credentials_controller.rb:90
 msgid "File contents"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_credentials_controller.rb:99 ../app/controllers/katello/api/v2/repositories_controller.rb:386
+#: ../app/controllers/katello/api/v2/content_credentials_controller.rb:99 ../app/controllers/katello/api/v2/repositories_controller.rb:382
 msgid "No file uploaded"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:9
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:8
 msgid "Performs an incremental-export of a content view version."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:10 ../app/controllers/katello/api/v2/content_exports_controller.rb:8 ../app/controllers/katello/api/v2/content_exports_controller.rb:37 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:50 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:56 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:68 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:82 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:89 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:132
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:9 ../app/controllers/katello/api/v2/content_exports_controller.rb:7 ../app/controllers/katello/api/v2/content_exports_controller.rb:30 ../app/controllers/katello/api/v2/content_imports_controller.rb:10 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:46 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:52 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:64 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:78 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:85
 msgid "Content view version identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:11 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:31 ../app/controllers/katello/api/v2/content_exports_controller.rb:10 ../app/controllers/katello/api/v2/content_exports_controller.rb:38 ../app/controllers/katello/api/v2/content_exports_controller.rb:54
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:10 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:30 ../app/controllers/katello/api/v2/content_exports_controller.rb:9 ../app/controllers/katello/api/v2/content_exports_controller.rb:31 ../app/controllers/katello/api/v2/content_exports_controller.rb:47
 msgid "Destination Server name"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:12 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:32 ../app/controllers/katello/api/v2/content_exports_controller.rb:39 ../app/controllers/katello/api/v2/content_exports_controller.rb:55
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:11 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:31 ../app/controllers/katello/api/v2/content_exports_controller.rb:32 ../app/controllers/katello/api/v2/content_exports_controller.rb:48
 msgid "Split the exported content into archives no greater than the specified size in megabytes."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:14 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:34
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:13 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:33
 msgid "Export history identifier used for incremental export. If not provided the most recent export history will be used."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:16 ../app/controllers/katello/api/v2/content_exports_controller.rb:41
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:15 ../app/controllers/katello/api/v2/content_exports_controller.rb:34
 msgid "Fails if any of the repositories belonging to this version are unexportable. False by default."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:29
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:28
 msgid "Performs an incremental-export of the repositories in library."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:36 ../app/controllers/katello/api/v2/content_exports_controller.rb:57
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:35 ../app/controllers/katello/api/v2/content_exports_controller.rb:50
 msgid "Fails if any of the repositories belonging to this organization are unexportable. False by default."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:61
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:60
 msgid "Unable to incrementally export. Do a Full Export on the library content before updating from the latest increment."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:79
+#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:78
 msgid "No existing export history was found to perform an incremental export. A full export must be performed"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:94 ../app/controllers/katello/api/v2/content_exports_controller.rb:84
-msgid "Invalid usage for Pulp 2 repositories. Use export for Yum repositories"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:7
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:6
 msgid "List export histories"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:9 ../app/controllers/katello/api/v2/content_imports_controller.rb:8 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:20 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:123 ../app/controllers/katello/api/v2/content_views_controller.rb:88 ../app/controllers/katello/api/v2/content_views_controller.rb:97
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:8 ../app/controllers/katello/api/v2/content_imports_controller.rb:11 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:18 ../app/controllers/katello/api/v2/content_views_controller.rb:80 ../app/controllers/katello/api/v2/content_views_controller.rb:89
 msgid "Content view identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:12
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:11
 msgid "Content view version export history identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:14
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:13
 msgid "Export Types"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:30
-msgid "true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only."
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:36
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:29
 msgid "Performs a full-export of a content view version."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_exports_controller.rb:52
+#: ../app/controllers/katello/api/v2/content_exports_controller.rb:45
 msgid "Performs a full-export of the repositories in library."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_imports_controller.rb:7 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:122
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:9
+msgid "List import histories"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:13
+msgid "Content view version import history identifier"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:15
+msgid "Import Types"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:30
 msgid "Import a content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_imports_controller.rb:9 ../app/controllers/katello/api/v2/content_imports_controller.rb:23 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:124
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:32 ../app/controllers/katello/api/v2/content_imports_controller.rb:42
 msgid "Directory containing the exported Content View Version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_imports_controller.rb:10 ../app/controllers/katello/api/v2/content_imports_controller.rb:24 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:125
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:33 ../app/controllers/katello/api/v2/content_imports_controller.rb:43
 msgid "Metadata taken from the upstream export history for this Content View Version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_imports_controller.rb:13
-msgid "Cannot use this end point for importing to library. If you intented to upload to library, use the library endpoint."
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:40
+msgid "Import a content view version to the library"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_imports_controller.rb:21
-msgid "Import a content view version to the library"
+#: ../app/controllers/katello/api/v2/content_imports_controller.rb:52
+msgid "Action unauthorized to be performed in this organization."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_uploads_controller.rb:9
 msgid "Create an upload request"
 msgstr ""
@@ -594,19 +602,19 @@
 
 #: ../app/controllers/katello/api/v2/content_uploads_controller.rb:12
 msgid "Checksum of file to upload"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_uploads_controller.rb:13 ../app/controllers/katello/api/v2/repositories_controller.rb:363 ../app/controllers/katello/api/v2/repositories_controller.rb:374 ../app/controllers/katello/api/v2/repositories_controller.rb:403
-msgid "content type ('deb', 'docker_manifest', 'file', 'ostree', 'puppet_module', 'rpm', 'srpm')"
+#: ../app/controllers/katello/api/v2/content_uploads_controller.rb:13 ../app/controllers/katello/api/v2/repositories_controller.rb:359 ../app/controllers/katello/api/v2/repositories_controller.rb:370 ../app/controllers/katello/api/v2/repositories_controller.rb:399
+msgid "content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_uploads_controller.rb:20
 msgid "Upload a chunk of the file's content"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_uploads_controller.rb:21 ../app/controllers/katello/api/v2/content_uploads_controller.rb:33 ../app/controllers/katello/api/v2/repositories_controller.rb:399
+#: ../app/controllers/katello/api/v2/content_uploads_controller.rb:21 ../app/controllers/katello/api/v2/content_uploads_controller.rb:33 ../app/controllers/katello/api/v2/repositories_controller.rb:395
 msgid "Repository id"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_uploads_controller.rb:22 ../app/controllers/katello/api/v2/content_uploads_controller.rb:34
 msgid "Upload request id"
@@ -622,159 +630,159 @@
 
 #: ../app/controllers/katello/api/v2/content_uploads_controller.rb:32
 msgid "Delete an upload request"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:10
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:11
 msgid "List components attached to this content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:11 ../app/controllers/katello/api/v2/content_view_components_controller.rb:27 ../app/controllers/katello/api/v2/content_view_components_controller.rb:59 ../app/controllers/katello/api/v2/content_view_components_controller.rb:76
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:12 ../app/controllers/katello/api/v2/content_view_components_controller.rb:33 ../app/controllers/katello/api/v2/content_view_components_controller.rb:65 ../app/controllers/katello/api/v2/content_view_components_controller.rb:82
 msgid "composite content view identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:26
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:32
 msgid "Add components to the content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:28
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:34
 msgid "Array of components to add"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:29 ../app/controllers/katello/api/v2/content_view_components_controller.rb:78
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:35 ../app/controllers/katello/api/v2/content_view_components_controller.rb:84
 msgid "identifier of the version of the component content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:31
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:37
 msgid "content view identifier of the component who's latest version is desired"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:32
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:38
 msgid "true if the latest version of the component's content view is desired"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:58
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:64
 msgid "Remove components from the content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:60
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:66
 msgid "Array of content view component IDs to remove. Identifier of the component association"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:67
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:73
 msgid "Show a content view component"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:68
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:74
 msgid "composite content view numeric identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:69 ../app/controllers/katello/api/v2/content_view_components_controller.rb:77
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:75 ../app/controllers/katello/api/v2/content_view_components_controller.rb:83
 msgid "content view component ID. Identifier of the component association"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:75
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:81
 msgid "Update a component associated with the content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:79
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:85
 msgid "true if the latest version of the components content view is desired"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:89
+#: ../app/controllers/katello/api/v2/content_view_components_controller.rb:95
 msgid " Either select the latest content view or the content view version. Cannot set both."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:6
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:7
 msgid "List filter rules"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:7 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:24 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:68 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:76 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:102 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:53 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:61 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:79
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:8 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:29 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:73 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:81 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:107 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:53 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:61 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:79
 msgid "filter identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:8
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:9
 msgid "name of the content view filter rule"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:9
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:10
 msgid "errata_id of the content view filter rule"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:23
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:28
 msgid "Create a filter rule. The parameters included should be based upon the filter type."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:25
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:30
 msgid "package, package group, or docker tag names"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:26
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:31
 msgid "package group: uuid"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:27 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:79
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:32 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:84
 msgid "package: version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:28 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:80
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:33 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:85
 msgid "package: architecture"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:29 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:81
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:34 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:86
 msgid "package: minimum version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:30 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:82
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:35 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:87
 msgid "package: maximum version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:31 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:83
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:36 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:88
 msgid "erratum: id"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:32
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:37
 msgid "erratum: IDs or a select all object"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:33 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:84
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:38 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:89
 msgid "erratum: start date (YYYY-MM-DD)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:34 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:85
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:39 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:90
 msgid "erratum: end date (YYYY-MM-DD)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:35 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:86
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:40 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:91
 msgid "erratum: types (enhancement, bugfix, security)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:36
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:41
 msgid "erratum: search using the 'Issued On' or 'Updated On' column of the errata. Values are 'issued'/'updated'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:37
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:42
 msgid "module stream ids"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:67
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:72
 msgid "Show filter rule info"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:69 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:77 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:103
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:74 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:82 ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:108
 msgid "rule identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:75
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:80
 msgid "Update a filter rule. The parameters included should be based upon the filter type."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:78
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:83
 msgid "package, package group, or docker tag: name"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:101
+#: ../app/controllers/katello/api/v2/content_view_filter_rules_controller.rb:106
 msgid "Delete a filter rule"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_view_filters_controller.rb:10 ../app/controllers/katello/api/v2/content_view_filters_controller.rb:11
 msgid "list filters"
@@ -842,239 +850,155 @@
 
 #: ../app/controllers/katello/api/v2/content_view_histories_controller.rb:7
 msgid "Show a content view's history"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_histories_controller.rb:8 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:32 ../app/controllers/katello/api/v2/content_views_controller.rb:126 ../app/controllers/katello/api/v2/content_views_controller.rb:133 ../app/controllers/katello/api/v2/content_views_controller.rb:165 ../app/controllers/katello/api/v2/content_views_controller.rb:179 ../app/controllers/katello/api/v2/content_views_controller.rb:192 ../app/controllers/katello/api/v2/content_views_controller.rb:223
+#: ../app/controllers/katello/api/v2/content_view_histories_controller.rb:8 ../app/controllers/katello/api/v2/content_views_controller.rb:118 ../app/controllers/katello/api/v2/content_views_controller.rb:124 ../app/controllers/katello/api/v2/content_views_controller.rb:137 ../app/controllers/katello/api/v2/content_views_controller.rb:168
 msgid "content view numeric identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:8
-msgid "List content view puppet modules"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:10 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:22 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:42
-msgid "name of the puppet module"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:11 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:23 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:43
-msgid "author of the puppet module"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:12
-msgid "uuid of the puppet module"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:20
-msgid "Add a puppet module to the content view"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:24
-msgid "the id of the puppet module to associate"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:25 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:44
-msgid "the uuid of the puppet module to associate"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:31
-msgid "Show a content view puppet module"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:33 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:41 ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:53
-msgid "puppet module ID"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:39
-msgid "Update a puppet module associated with the content view"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb:51
-msgid "Remove a puppet module from the content view"
-msgstr ""
-
 #: ../app/controllers/katello/api/v2/content_view_repositories_controller.rb:13
 msgid "Content View id"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:18 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:19
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:16 ../app/controllers/katello/api/v2/content_view_versions_controller.rb:17
 msgid "List content view versions"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:21
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:19
 msgid "Filter versions by environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:22
-msgid "Filter versions by puppet module"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:23
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:20
 msgid "Filter versions by version number"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:24
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:21
 msgid "Filter versions that are components in the specified composite version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:26
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:23
 msgid "Filter composite versions whose publish was triggered by the specified component version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:49
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:45
 msgid "Show content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:55
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:51
 msgid "Promote a content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:57
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:53
 msgid "force content view promotion and bypass lifecycle environment restriction"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:58
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:54
 msgid "Identifiers for Lifecycle Environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:59
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:55
 msgid "The description for the content view version promotion"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:67
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:63
 msgid "Update a content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:69
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:65
 msgid "The description for the content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:73
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:69
 msgid "This content view version doesn't have a history."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:81
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:77
 msgid "Forces a republish of the version's repositories' metadata"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:88
-msgid "Export a content view version.  Relevant only for Pulp 2 repositories."
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:90
-msgid "Export to ISO format."
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:91
-msgid "maximum size of each ISO in MB. Relevant only for Pulp 2 repositories"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:92
-msgid "Optional date of last export (ex: 2010-01-01T12:00:00Z). Relevant only for Pulp 2 repositories"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:95
-msgid "Invalid usage for Pulp 3 repositories. Use hammer content-export for Yum repositories"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:100 ../app/controllers/katello/api/v2/repositories_controller.rb:314
-msgid "ISO export must be enabled when specifying ISO size"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:104
-msgid "This content view has on demand repositories that cannot be exported: %{repos}"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:111 ../app/controllers/katello/api/v2/repositories_controller.rb:321
-msgid "Invalid date provided."
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:131
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:84
 msgid "Remove content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:138
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:91
 msgid "Perform an Incremental Update on one or more Content View Versions"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:140
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:93
 msgid "Content View Version Ids to perform an incremental update on.  May contain composites as well as one or more components to update."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:141
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:94
 msgid "The list of environments to promote the specified Content View Version to (replacing the older version)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:143
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:96
 msgid "The description for the new generated Content View Versions"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:144
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:97
 msgid "If true, when adding the specified errata or packages, any needed dependencies will be copied as well. Defaults to true"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:145
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:98
 msgid "If true, will publish a new composite version using any specified content_view_version_id that has been promoted to a lifecycle environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:152
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:104
 msgid "After generating the incremental update, apply the changes to the specified hosts.  Only Errata are supported currently."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:154
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:106
 msgid "Search string for host to perform an action on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:155 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:49
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:107 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:49
 msgid "List of host ids to perform an action on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:158 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:52
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:110 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:52
 msgid "List of host ids to exclude and not run an action on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:163
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:115
 msgid "Incremental update requires at least one content unit"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:203
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:155
 msgid "The default content view cannot be promoted"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:221
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:173
 msgid "At least one Content View Version must be specified"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:232
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:184
 msgid "You are not allowed to publish Content View %s"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:236
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:188
 msgid "You are not allowed to promote to Environments %s"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:241
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:193
 msgid "Could not find Environment with ids: %s"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:294
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:241
 msgid "Could not find %{count} errata.  Only found: %{found}"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:300
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:247
 msgid "package_ids is not an array"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:304
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:251
 msgid "deb_ids is not an array"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:308
-msgid "puppet_module_ids is not an array"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:317
+#: ../app/controllers/katello/api/v2/content_view_versions_controller.rb:260
 msgid "Could not find environments for promotion"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_views_controller.rb:19
 msgid "Description for the content view"
@@ -1098,179 +1022,163 @@
 
 #: ../app/controllers/katello/api/v2/content_views_controller.rb:24
 msgid "Designate this Content View for importing from upstream servers only. Defaults to false"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:38 ../app/controllers/katello/api/v2/content_views_controller.rb:39
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:34 ../app/controllers/katello/api/v2/content_views_controller.rb:35
 msgid "List content views"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:42
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:38
 msgid "Filter out default content views"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:43
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:39
 msgid "Filter out composite content views"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:44
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:40
 msgid "Filter only composite content views"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:45
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:41
 msgid "Do not include this array of content views"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:46 ../app/controllers/katello/api/v2/content_views_controller.rb:70
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:42 ../app/controllers/katello/api/v2/content_views_controller.rb:66
 msgid "Name of the content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:67 ../app/controllers/katello/api/v2/content_views_controller.rb:68
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:63 ../app/controllers/katello/api/v2/content_views_controller.rb:64
 msgid "Create a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:71
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:67
 msgid "Content view label"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:72
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:68
 msgid "Composite content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:76
-msgid "Import-only content views will be available in a future version."
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:87
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:79
 msgid "Update a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:89
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:81
 msgid "New name for the content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:96
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:88
 msgid "Publish a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:98
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:90
 msgid "Description for the new published content view version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:99
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:91
 msgid "Override the major version number"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:100
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:92
 msgid "Override the minor version number"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:101
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:93
 msgid "Specify the list of units in each repo"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:102
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:94
 msgid "repo label"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:103
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:95
 msgid "list of rpm filename strings to include in published version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:107
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:99
 msgid "Directly setting package lists on composite content views is not allowed. Please update the components, then re-publish the composite."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:111
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:103
 msgid "A CV version already exists with the same major and minor version (%{major}.%{minor})"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:115
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:107
 msgid "Both major and minor parameters have to be used to override a CV version"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:125
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:117
 msgid "Show a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:132
-msgid "Get puppet modules that are available to be added to the content view"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:134
-msgid "module name to restrict modules for"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:164
-msgid "Get puppet modules names that are available to be added to the content view"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:178
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:123
 msgid "Remove a content view from an environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:180
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:125
 msgid "environment numeric identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:183
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:128
 msgid "Content view '%{view}' is not in lifecycle environment '%{env}'."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:191
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:136
 msgid "Remove versions and/or environments from a content view and reassign systems and keys"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:193
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:138
 msgid "environment numeric identifiers to be removed"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:194
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:139
 msgid "content view version identifiers to be deleted"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:195
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:140
 msgid "content view to reassign orphaned systems to"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:196
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:141
 msgid "environment to reassign orphaned systems to"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:197
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:142
 msgid "content view to reassign orphaned activation keys to"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:198
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:143
 msgid "environment to reassign orphaned activation keys to"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:206
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:151
 msgid "There either were no environments nor versions specified or there were invalid environments/versions specified. Please check environment_ids and content_view_version_ids parameters."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:222
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:167
 msgid "Delete a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:229
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:174
 msgid "Make copy of a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:230
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:175
 msgid "Content view numeric identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:231
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:176
 msgid "New content view name"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:244
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:189
 msgid "The default content view cannot be edited, published, or deleted."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/content_views_controller.rb:267
+#: ../app/controllers/katello/api/v2/content_views_controller.rb:212
 msgid "Always Use Latest (currently %{version})"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/debs_controller.rb:6
 msgid "a deb"
@@ -1402,11 +1310,11 @@
 
 #: ../app/controllers/katello/api/v2/errata_controller.rb:14 ../app/controllers/katello/api/v2/errata_controller.rb:68 ../app/controllers/katello/api/v2/packages_controller.rb:35
 msgid "Content View Filter identifier"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/errata_controller.rb:15 ../app/controllers/katello/api/v2/errata_controller.rb:69 ../app/controllers/katello/api/v2/packages_controller.rb:36 ../app/controllers/katello/api/v2/repositories_controller.rb:257 ../app/controllers/katello/api/v2/repositories_controller.rb:308 ../app/controllers/katello/api/v2/srpms_controller.rb:8
+#: ../app/controllers/katello/api/v2/errata_controller.rb:15 ../app/controllers/katello/api/v2/errata_controller.rb:69 ../app/controllers/katello/api/v2/packages_controller.rb:36 ../app/controllers/katello/api/v2/repositories_controller.rb:254 ../app/controllers/katello/api/v2/repositories_controller.rb:305 ../app/controllers/katello/api/v2/srpms_controller.rb:8
 msgid "Repository identifier"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/errata_controller.rb:16 ../app/controllers/katello/api/v2/errata_controller.rb:70 ../app/controllers/katello/api/v2/packages_controller.rb:37 ../app/controllers/katello/api/v2/srpms_controller.rb:9
 msgid "Environment identifier"
@@ -1478,11 +1386,11 @@
 
 #: ../app/controllers/katello/api/v2/host_collections_controller.rb:36
 msgid "List host collections in an activation key"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_collections_controller.rb:40
+#: ../app/controllers/katello/api/v2/host_collections_controller.rb:40 ../app/controllers/katello/api/v2/repository_sets_controller.rb:29
 msgid "activation key identifier"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_collections_controller.rb:41
 msgid "Filter products by host id"
@@ -1570,79 +1478,79 @@
 
 #: ../app/controllers/katello/api/v2/host_debs_controller.rb:13 ../app/controllers/katello/api/v2/host_module_streams_controller.rb:13 ../app/controllers/katello/api/v2/host_packages_controller.rb:22 ../app/controllers/katello/api/v2/host_packages_controller.rb:31 ../app/controllers/katello/api/v2/host_packages_controller.rb:49 ../app/controllers/katello/api/v2/host_packages_controller.rb:60 ../app/controllers/katello/api/v2/host_packages_controller.rb:67 ../app/controllers/katello/api/v2/host_tracer_controller.rb:11 ../app/controllers/katello/api/v2/host_tracer_controller.rb:18
 msgid "ID of the host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:21
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:22
 msgid "Errata to exclusively include in the action"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:22
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:23
 msgid "Search string for erratum to perform an action on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:23
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:24
 msgid "List of errata ids to perform an action on, (ex: RHSA-2019:1168)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:25
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:26
 msgid "Errata to explicitly exclude in the action. All other applicable errata will be included in the action, unless an included parameter is passed as well."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:28
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:29
 msgid "List of errata ids to exclude and not run an action on, (ex: RHSA-2019:1168)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:32
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:33
 msgid "List errata available for the content host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:33
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:34
 msgid "UUID of the content host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:34
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:35
 msgid "Calculate Applicable Errata based on a particular Content View"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:35
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:36
 msgid "Calculate Applicable Errata based on a particular Environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:39
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:40
 msgid "Either both parameters 'content_view_id' and 'environment_id' should be specified or neither should be specified"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:52
-msgid "Schedule errata for installation"
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:53
+msgid "Schedule errata for installation using katello-agent. %s"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:53 ../app/controllers/katello/api/v2/host_errata_controller.rb:63 ../app/controllers/katello/api/v2/host_errata_controller.rb:72
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:54 ../app/controllers/katello/api/v2/host_errata_controller.rb:64 ../app/controllers/katello/api/v2/host_errata_controller.rb:73
 msgid "Host ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:54
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:55
 msgid "List of Errata ids to install. Will be removed in Katello 4.1."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:62
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:63
 msgid "Retrieve a single errata for a host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:64
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:65
 msgid "Errata id of the erratum (RHSA-2012:108)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:67 ../app/controllers/katello/api/v2/host_errata_controller.rb:141
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:68 ../app/controllers/katello/api/v2/host_errata_controller.rb:142
 msgid "Couldn't find errata ids '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:71
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:72
 msgid "Force regenerate applicability."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_errata_controller.rb:101
+#: ../app/controllers/katello/api/v2/host_errata_controller.rb:102
 msgid "No errata has been specified."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_module_streams_controller.rb:12
 msgid "List module streams available to the host"
@@ -1663,23 +1571,23 @@
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:21
 msgid "List packages installed on the host"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:30
-msgid "Install packages remotely"
+msgid "Install packages remotely using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:48 ../app/controllers/katello/api/v2/host_packages_controller.rb:59
-msgid "Update packages remotely"
+msgid "Update packages remotely using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:50
 msgid "list of packages names"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:66
-msgid "Uninstall packages remotely"
+msgid "Uninstall packages remotely using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_packages_controller.rb:96
 msgid "Couldn't find host with host id '%s'"
 msgstr ""
@@ -1744,11 +1652,11 @@
 
 #: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:35
 msgid "List a host's subscriptions"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:36 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:50 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:61 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:114 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:132 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:170
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:36 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:50 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:61 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:114 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:132 ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:151 ../app/controllers/katello/api/v2/repository_sets_controller.rb:30
 msgid "Id of the host"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:49
 msgid "Trigger an auto-attach of subscriptions"
@@ -1817,54 +1725,54 @@
 #: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:139
 msgid "This host's organization is in Simple Content Access mode. Attaching subscriptions is disabled."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:150
+msgid "Get content and overrides for the host"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:153
+msgid "Limit content to just that available in the host's content view version"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:159
 msgid "Set content overrides for the host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:151
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:160
 msgid "Id of the content host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:152
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:161
 msgid "Override to a boolean value or 'default'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:153 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:201
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:162 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:201
 msgid "Array of Content override parameters"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:156 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:204
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:165 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:204
 msgid "Override key or name. Note if name is not provided the default name will be 'enabled'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:169
-msgid "Get content and overrides for the host"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:172
-msgid "Limit content to just that available in the host's content view version"
-msgstr ""
-
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:188
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:178
 msgid "Show releases available for the content host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:189
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:179
 msgid "id of host"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:200
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:196
 msgid "Couldn't find specified Content View and Lifecycle Environment."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:204
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:200
 msgid "subscriptions not specified"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:221
+#: ../app/controllers/katello/api/v2/host_subscriptions_controller.rb:217
 msgid "unknown permission for %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_tracer_controller.rb:10
 msgid "List services that need restarting on the host"
@@ -1913,11 +1821,11 @@
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:111
 msgid "Fetch installable errata for one or more hosts."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:118
-msgid "Install content on one or more hosts"
+msgid "Install content on one or more hosts using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:121
 msgid "The type of content.  The following types are supported: 'package', 'package_group' and 'errata'."
 msgstr ""
@@ -1925,11 +1833,11 @@
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:123
 msgid "List of content (e.g. package names, package group names or errata ids)"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:128
-msgid "Update content on one or more hosts"
+msgid "Update content on one or more hosts using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:131 ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:142
 msgid "The type of content.  The following types are supported: 'package' and 'package_group."
 msgstr ""
@@ -1941,11 +1849,11 @@
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:134
 msgid "Updates all packages on the host(s)"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:139
-msgid "Remove content on one or more hosts"
+msgid "Remove content on one or more hosts using katello-agent. %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb:149
 msgid "Destroy one or more hosts"
 msgstr ""
@@ -2148,71 +2056,71 @@
 
 #: ../app/controllers/katello/api/v2/organizations_controller.rb:68
 msgid "Create organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:83
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:84
 msgid "Delete an organization"
 msgstr ""
 
-#: ../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
+#: ../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:262 ../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:134 ../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
 msgid "Organization ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:90
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:91
 msgid "Discover Repositories"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:92
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:93
 msgid "Base URL to perform repo discovery on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:93
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:94
 msgid "One of yum or docker"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:94
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:95
 msgid "Username to access URL"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:95
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:96
 msgid "Password to access URL"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:96
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:97
 msgid "Search pattern (defaults to '*')"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:98
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:99
 msgid "url not defined."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:105
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:106
 msgid "Cancel repository discovery"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:106 ../app/controllers/katello/api/v2/organizations_controller.rb:114
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:107 ../app/controllers/katello/api/v2/organizations_controller.rb:115
 msgid "Organization label"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:107
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:108
 msgid "base url to perform repo discovery on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:113
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:114
 msgid "Download a debug certificate"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:123
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:124
 msgid "List available releases in the organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:124
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:125
 msgid "ID of the Organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:135
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:136
 msgid "List all :resource_id"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/ostree_branches_controller.rb:3
 msgid "an ostree branch"
@@ -2292,11 +2200,11 @@
 
 #: ../app/controllers/katello/api/v2/packages_controller.rb:29
 msgid "List packages"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/packages_controller.rb:30 ../app/controllers/katello/api/v2/packages_controller.rb:31 ../app/controllers/katello/api/v2/packages_controller.rb:32 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:19 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:20 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:21 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:22 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:45
+#: ../app/controllers/katello/api/v2/packages_controller.rb:30 ../app/controllers/katello/api/v2/packages_controller.rb:31 ../app/controllers/katello/api/v2/packages_controller.rb:32 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:20 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:21 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:22 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:23 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:47
 msgid "List :resource_id"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/packages_controller.rb:38
 msgid "Package identifiers to filter content by"
@@ -2494,14 +2402,10 @@
 
 #: ../app/controllers/katello/api/v2/products_controller.rb:119 ../app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb:49
 msgid "Unable to synchronize any repository. You either do not have the permission to synchronize or the selected repositories do not have a feed url."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/puppet_modules_controller.rb:3
-msgid "a puppet module"
-msgstr ""
-
 #: ../app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb:5
 msgid "Destroy one or more repositories"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb:14
@@ -2591,19 +2495,19 @@
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:54
 msgid "if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:55
-msgid "comma-separated list of releases to be synced from deb-archive"
+msgid "whitespace-separated list of releases to be synced from deb-archive"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:56
-msgid "comma-separated list of repo components to be synced from deb-archive"
+msgid "whitespace-separated list of repo components to be synced from deb-archive"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:57
-msgid "comma-separated list of architectures to be synced from deb-archive"
+msgid "whitespace-separated list of architectures to be synced from deb-archive"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:58
 msgid "List of content units to ignore while syncing a yum repository. Must be subset of %s"
 msgstr ""
@@ -2611,374 +2515,402 @@
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:59
 msgid "Contents of requirement yaml file to sync from URL"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:60
-msgid "policies for HTTP proxy for content sync"
+msgid "The URL to receive a session token from, e.g. used with Automation Hub."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:61
-msgid "ID of a HTTP Proxy"
+msgid "The token key to use for authentication."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:62
+msgid "policies for HTTP proxy for content sync"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:63
+msgid "ID of a HTTP Proxy"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:64
 msgid "Architecture of content in the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:67
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:69
 msgid "Product the repository belongs to"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:68
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:70
 msgid "type of repo"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:71
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:73
 msgid "List of enabled repositories"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:72
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:74
 msgid "List of repositories for a content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:73
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:75
 msgid "List of repositories in an organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:74
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:76
 msgid "List repositories in the environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:75
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:77
 msgid "List of repositories for a product"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:76
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:78
 msgid "List of repositories belonging to a product in an environment"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:77
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:79
 msgid "ID of an organization to show repositories in"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:78
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:80
 msgid "ID of a product to show repositories of"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:79
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:81
 msgid "ID of an environment to show repositories in"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:80
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:82
 msgid "ID of a content view to show repositories in"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:81
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:83
 msgid "ID of a content view version to show repositories in"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:82
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:84
 msgid "Id of a deb package to find repositories that contain the deb"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:83
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:85
 msgid "Id of an erratum to find repositories that contain the erratum"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:84
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:86
 msgid "Id of a rpm package to find repositories that contain the rpm"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:85
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:87
 msgid "Id of a file to find repositories that contain the file"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:86
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:88
 msgid "Id of an ansible collection to find repositories that contain the ansible collection"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:87
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:89
 msgid "Id of an ostree branch to find repositories that contain that branch"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:88
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:90
 msgid "show repositories in Library and the default content view"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:89
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:91
 msgid "show archived repositories"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:90
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:92
 msgid "limit to only repositories of this type"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:91
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:93
 msgid "name of the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:92
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:94
 msgid "label of the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:93 ../app/controllers/katello/api/v2/repositories_controller.rb:340
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:95 ../app/controllers/katello/api/v2/repositories_controller.rb:337
 msgid "description of the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:94
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:96
 msgid "interpret specified object to return only Repositories that can be associated with specified object.  Only 'content_view' & 'content_view_version' are supported."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:96
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:98
 msgid "only repositories having at least one of the specified content type ex: rpm , erratum"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:97
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:99
 msgid "limit to only repositories with this download policy"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:216
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:100
+msgid "only show the repositories readable by this user with this username"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:213
 msgid "Create a custom repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:217
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:214
 msgid "Name of the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:218
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:215
 msgid "Description of the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:224
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:221
 msgid "Invalid params provided - content_type must be one of %s"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:248
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:245
 msgid "Show the available repository types"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:249
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:246
 msgid "When set to 'True' repository types that are creatable will be returned"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:256
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:253
 msgid "Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:263
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:260
 msgid "Show a repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:264 ../app/controllers/katello/api/v2/repositories_controller.rb:271 ../app/controllers/katello/api/v2/repositories_controller.rb:299 ../app/controllers/katello/api/v2/repositories_controller.rb:338 ../app/controllers/katello/api/v2/repositories_controller.rb:372
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:261 ../app/controllers/katello/api/v2/repositories_controller.rb:268 ../app/controllers/katello/api/v2/repositories_controller.rb:296 ../app/controllers/katello/api/v2/repositories_controller.rb:335 ../app/controllers/katello/api/v2/repositories_controller.rb:368
 msgid "repository ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:270
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:267
 msgid "Sync a repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:272
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:269
 msgid "temporarily override feed URL for sync"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:273
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:270
 msgid "perform an incremental import"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:274
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:271
 msgid "Force sync even if no upstream changes are detected. Only used with yum repositories."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:275
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:272
 msgid "Force a sync and validate the checksums of all content. Only used with yum repositories."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:285
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:282
 msgid "source URL is malformed"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:289
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:286
 msgid "attempted to sync without a feed URL"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:298
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:295
 msgid "Verify checksum of repository contents"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:307
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:304
 msgid "Export a repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:309
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:306
 msgid "Export to ISO format"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:310
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:307
 msgid "maximum size of each ISO in MB"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:311
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:308
 msgid "Optional date of last export (ex: 2010-01-01T12:00:00Z)"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:325
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:311
+msgid "ISO export must be enabled when specifying ISO size"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:318
+msgid "Invalid date provided."
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:322
 msgid "Repository content type must be 'yum' to export."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:327
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:324
 msgid "On demand repositories cannot be exported."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:337
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:334
 msgid "Update a repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:349
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:346
 msgid "Destroy a custom repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:364 ../app/controllers/katello/api/v2/repositories_controller.rb:402
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:360 ../app/controllers/katello/api/v2/repositories_controller.rb:398
 msgid "Whether or not to sync an external capsule after upload. Default: true"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:367
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:363
 msgid "No content ids provided"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:371
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:367
 msgid "Upload content into the repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:373
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:369
 msgid "Content files to upload. Can be a single file or array of files."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:376
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:372
 msgid "Cannot upload Container Image content."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:398
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:394
 msgid "Import uploads into a repository"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:400
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:396
 msgid "Do not wait for the ImportUpload action to finish. Default: false"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:401
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:397
 msgid "Whether or not to regenerate the repository on disk. Default: true"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:404
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:400
 msgid "Array of uploads to import"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:409
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:405
 msgid "Needs to only be set for file repositories or docker tags"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:410
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:406
 msgid "Needs to only be set for docker tags"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:417
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:413
 msgid "No uploads param specified. An array of uploads to import is required."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:437
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:433
 msgid "Return the content of a repo gpg key, used directly by yum"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:471
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:467
 msgid "Couldn't find %{content_type} with id '%{id}'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:535
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:537
 msgid "Red Hat products cannot be manipulated."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repositories_controller.rb:539
+#: ../app/controllers/katello/api/v2/repositories_controller.rb:541
 msgid "Red Hat repositories cannot be manipulated."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:18
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:21
 msgid "List repository sets."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:19
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:22
 msgid "List repository sets for a product."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:20 ../app/controllers/katello/api/v2/repository_sets_controller.rb:35 ../app/controllers/katello/api/v2/repository_sets_controller.rb:44
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:23 ../app/controllers/katello/api/v2/repository_sets_controller.rb:46 ../app/controllers/katello/api/v2/repository_sets_controller.rb:55
 msgid "ID of a product to list repository sets from"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:21
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:24
 msgid "Repository set name to search on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:22
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:25
 msgid "If true, only return repository sets that have been enabled. Defaults to false"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:23
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:26
 msgid "If true, only return repository sets that are associated with an active subscriptions"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:25
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:28
 msgid "If true, return custom repository sets along with redhat repos"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:32 ../app/controllers/katello/api/v2/repository_sets_controller.rb:33
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:31
+msgid "Get all content available, not just that provided by subscriptions. Relevant for Activation Keys only"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:32
+msgid "Limit content to just that available in the activation key's content view version. Relevant for Activation Keys only"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:43 ../app/controllers/katello/api/v2/repository_sets_controller.rb:44
 msgid "Get info about a repository set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:34 ../app/controllers/katello/api/v2/repository_sets_controller.rb:43
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:45 ../app/controllers/katello/api/v2/repository_sets_controller.rb:54
 msgid "ID of the repository set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:41 ../app/controllers/katello/api/v2/repository_sets_controller.rb:42
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:52 ../app/controllers/katello/api/v2/repository_sets_controller.rb:53
 msgid "Get list of available repositories for the repository set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:76 ../app/controllers/katello/api/v2/repository_sets_controller.rb:77
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:87 ../app/controllers/katello/api/v2/repository_sets_controller.rb:88
 msgid "Enable a repository from the set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:78
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:89
 msgid "ID of the repository set to enable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:79 ../app/controllers/katello/api/v2/repository_sets_controller.rb:91
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:90 ../app/controllers/katello/api/v2/repository_sets_controller.rb:102
 msgid "ID of the product containing the repository set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:80
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:91
 msgid "Basearch to enable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:81
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:92
 msgid "Releasever to enable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:88 ../app/controllers/katello/api/v2/repository_sets_controller.rb:89
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:99 ../app/controllers/katello/api/v2/repository_sets_controller.rb:100
 msgid "Disable a repository from the set"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:90
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:101
 msgid "ID of the repository set to disable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:92
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:103
 msgid "Basearch to disable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:93
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:104
 msgid "Releasever to disable"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:160
+#: ../app/controllers/katello/api/v2/repository_sets_controller.rb:184
 msgid "Repository sets are not available for custom products."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/simple_content_access_controller.rb:12 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:81
 msgid "Check if the specified organization is eligible for Simple Content Access"
@@ -3019,66 +2951,74 @@
 #: ../app/controllers/katello/api/v2/subscriptions_controller.rb:26
 msgid "Activation key ID"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/subscriptions_controller.rb:27
-msgid "Object to show subscriptions available for, either 'host' or 'activation_key'"
+msgid "name of the subscription"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/subscriptions_controller.rb:28
-msgid "Ignore subscriptions that are unavailable to the specified host"
+msgid "Object to show subscriptions available for, either 'host' or 'activation_key'"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/subscriptions_controller.rb:29
-msgid "Return subscriptions that match installed products of the specified host"
+msgid "Ignore subscriptions that are unavailable to the specified host"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/subscriptions_controller.rb:30
+msgid "Return subscriptions that match installed products of the specified host"
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:31
 msgid "Return subscriptions which do not overlap with a currently-attached subscription"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:72 ../app/controllers/katello/api/v2/subscriptions_controller.rb:73
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:34
+msgid "Organization Information not provided."
+msgstr ""
+
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:78 ../app/controllers/katello/api/v2/subscriptions_controller.rb:79
 msgid "Show a subscription"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:79
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:85
 msgid "Subscription not found"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:82
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:88
 msgid "This subscription is not relevant to the current organization."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:88
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:94
 msgid "Upload a subscription manifest"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:89 ../app/controllers/katello/api/v2/subscriptions_controller.rb:114 ../app/controllers/katello/api/v2/subscriptions_controller.rb:121
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:95 ../app/controllers/katello/api/v2/subscriptions_controller.rb:120 ../app/controllers/katello/api/v2/subscriptions_controller.rb:127
 msgid "Organization id"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:90
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:96
 msgid "Subscription manifest file"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:91
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:97
 msgid "repository url"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:93
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:99
 msgid "No manifest file uploaded"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:113
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:119
 msgid "Refresh previously imported manifest for Red Hat provider"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:120
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:126
 msgid "Delete manifest from Red Hat provider"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:127
+#: ../app/controllers/katello/api/v2/subscriptions_controller.rb:133
 msgid "obtain manifest history for subscriptions"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/sync_controller.rb:7
 msgid "Get status of repo synchronisation for given product"
@@ -3098,11 +3038,11 @@
 
 #: ../app/controllers/katello/api/v2/sync_controller.rb:30
 msgid "Couldn't find product with id '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/sync_controller.rb:36 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:177
+#: ../app/controllers/katello/api/v2/sync_controller.rb:36 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:165
 msgid "Couldn't find repository '%s'"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/sync_controller.rb:42
 msgid "You can check sync status for repositories only in the library lifecycle environment.'"
@@ -3278,10 +3218,18 @@
 
 #: ../app/controllers/katello/application_controller.rb:105
 msgid "Invalid parameters sent. You may have mistyped the address. If you continue having trouble with this, please contact an Administrator."
 msgstr ""
 
+#: ../app/controllers/katello/concerns/api/api_controller.rb:22
+msgid "NOTE: Katello-agent is deprecated and will be removed in %s. Consider using remote execution instead."
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/api_controller.rb:26
+msgid "a future release"
+msgstr ""
+
 #: ../app/controllers/katello/concerns/api/v2/authorization.rb:44
 msgid "Could not find %{name} resource with id %{id}. %{perms_message}"
 msgstr ""
 
 #: ../app/controllers/katello/concerns/api/v2/authorization.rb:64
@@ -3338,135 +3286,163 @@
 
 #: ../app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb:29
 msgid "List of host collection ids to update"
 msgstr ""
 
+#: ../app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb:31
+msgid "Activation key for subscription-manager client. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3."
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb:32
+msgid "Activation key(s) for subscription-manager client. Required for CentOS and Red Hat Enterprise Linux. Required only if host group has no activation keys"
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb:33
+msgid "Lifecycle environment for the host."
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb:34
+msgid "Clear any previous registration and run subscription-manager with --force."
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb:35
+msgid "Ignore subscription-manager errors for `subscription-manager register` command"
+msgstr ""
+
 #: ../app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb:10
 msgid "Host was not found by the subscription UUID: '%s', this can happen if the host is registered already, but not to this Foreman"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:24
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:25
 msgid "content view version identifier"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:25
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:26
 msgid "content view filter identifier"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:26
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:27
 msgid "content view filter rule identifier"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:27 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:38
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:28 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:40
 msgid "repository identifier"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:29
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:30
 msgid "ids to filter content by"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:36 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:37
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:31
+msgid "Includes associated content view filter ids in response"
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:38 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:39
 msgid "Show :a_resource"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:40
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:42
 msgid ":a_resource identifier"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:46
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:48
 msgid "content view versions to compare"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:47
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:49
 msgid "Library repository id to restrict comparisons to"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:49
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:51
 msgid "No content_view_version_ids provided"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:54
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:56
 msgid "Couldn't find content view versions '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:72
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:74
 msgid "Return content that can be added to the specified object.  The values 'content_view_version' and 'content_view_filter are supported."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:73
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:76
+msgid "Returns content that can be both added and is currently added to the object. The value 'content_view_filter' is supported"
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:77
 msgid "Content View Filter id"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:156
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:144
 msgid "Failed to find %{content} with id '%{id}'."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:161 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:279
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:149 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:271
 msgid "Could not find %{content} with id '%{id}' in repository."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:166
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:154
 msgid "The requested resource does not belong to the specified organization"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:185
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:173
 msgid "Could not find Lifecycle Environment with id '%{id}'."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:194
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:182
 msgid "Couldn't find content view version '%s'"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:207 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:220
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:195 ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:208
 msgid "Couldn't find %{type} Filter with id %{id}"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:245
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:216
+msgid "params 'show_all_for' and 'available_for' must be used independently"
+msgstr ""
+
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:239
 msgid "Erratum"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:247
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:241
 msgid "Deb Package"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:249
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:243
 msgid "Package"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:251 ../webpack/scenes/RedHatRepositories/components/SearchBar.js:22
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:245 ../webpack/scenes/RedHatRepositories/components/SearchBar.js:22
 msgid "Source RPM"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:253
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:247
 msgid "Package Group"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:255
-msgid "Puppet Module"
-msgstr ""
-
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:257
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:249
 msgid "Container Image Manifest"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:259
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:251
 msgid "Container Image Tag"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:261
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:253
 msgid "OSTree Branch"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:263
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:255
 msgid "File"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:265
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:257
 msgid "Module Stream"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:267
+#: ../app/controllers/katello/concerns/api/v2/repository_content_controller.rb:259
 msgid "Ansible Collection"
 msgstr ""
 
 #: ../app/controllers/katello/concerns/api/v2/smart_proxies_controller_extensions.rb:9
 msgid "Download Policy of the capsule, must be one of %s"
@@ -3542,18 +3518,10 @@
 
 #: ../app/helpers/katello/application_helper.rb:70
 msgid "No Content View"
 msgstr ""
 
-#: ../app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb:9
-msgid "Puppet Environment"
-msgstr ""
-
-#: ../app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb:11
-msgid "Reset Puppet Environment"
-msgstr ""
-
 #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:31
 msgid "On Demand"
 msgstr ""
 
 #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:35
@@ -3566,11 +3534,11 @@
 
 #: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:43
 msgid "Inherit from Repository"
 msgstr ""
 
-#: ../app/helpers/katello/hosts_and_hostgroups_helper.rb:255 ../lib/katello/plugin.rb:8 ../lib/katello/plugin.rb:265 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:58
+#: ../app/helpers/katello/hosts_and_hostgroups_helper.rb:255 ../lib/katello/plugin.rb:8 ../lib/katello/plugin.rb:255 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:72
 msgid "Content"
 msgstr ""
 
 #: ../app/helpers/katello/hosts_and_hostgroups_helper.rb:257
 msgid "Host content and subscription details"
@@ -3619,22 +3587,22 @@
 #: ../app/lib/actions/candlepin/abstract_async_task.rb:22
 msgid "waiting for Candlepin to finish the task"
 msgstr ""
 
 #: ../app/lib/actions/foreman/environment/destroy.rb:8
-msgid "The puppet environment %{name} is in use by %{count} Host(s) including %{names}"
+msgid "The environment %{name} is in use by %{count} Host(s) including %{names}"
 msgstr ""
 
 #: ../app/lib/actions/foreman/environment/destroy.rb:14
-msgid "The puppet environment %{name} is in use by %{count} Host Group(s) including %{names}"
+msgid "The environment %{name} is in use by %{count} Host Group(s) including %{names}"
 msgstr ""
 
-#: ../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
+#: ../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/repository/create.rb:50 ../app/lib/actions/katello/repository/create_root.rb:17 action_names.rb:17
 msgid "Create"
 msgstr ""
 
-#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:69
+#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:57
 msgid "Delete Activation Key"
 msgstr ""
 
 #: ../app/lib/actions/katello/agent/dispatch_history_presenter.rb:56 ../app/models/katello/task_status.rb:313
 msgid "No new packages installed"
@@ -3642,35 +3610,35 @@
 
 #: ../app/lib/actions/katello/agent/dispatch_history_presenter.rb:58 ../app/models/katello/task_status.rb:311
 msgid "No packages removed"
 msgstr ""
 
-#: ../app/lib/actions/katello/agent_action.rb:78
+#: ../app/lib/actions/katello/agent_action.rb:82
 msgid "Host did not respond within %s seconds. The task has been cancelled. Is katello-agent installed and goferd running on the Host?"
 msgstr ""
 
-#: ../app/lib/actions/katello/agent_action.rb:82
+#: ../app/lib/actions/katello/agent_action.rb:86
 msgid "Host did not finish content action in %s seconds.  The task has been cancelled."
 msgstr ""
 
-#: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:71
+#: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:55
 msgid "Generate host applicability"
 msgstr ""
 
 #: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:16
 msgid "Content Facet for host with id %s is non-existent. Skipping applicability calculation."
 msgstr ""
 
-#: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:73
+#: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:54
 msgid "Bulk generate applicability for hosts"
 msgstr ""
 
-#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:2
+#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:53
 msgid "Generate repository applicability"
 msgstr ""
 
-#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:3
+#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:52
 msgid "Synchronize smart proxy"
 msgstr ""
 
 #: ../app/lib/actions/katello/capsule_content/sync.rb:31
 msgid "Action not allowed for the default smart proxy."
@@ -3678,11 +3646,11 @@
 
 #: ../app/lib/actions/katello/content_view/capsule_sync.rb:6
 msgid "Sync Content View on Smart Proxy(ies)"
 msgstr ""
 
-#: ../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
+#: ../app/lib/actions/katello/content_view/destroy.rb:34 ../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:16
 msgid "Delete"
 msgstr ""
 
 #: ../app/lib/actions/katello/content_view/errata_mail.rb:19 ../app/lib/actions/katello/repository/errata_mail.rb:22
 msgid "Unable to send errata e-mail notification: %{error}"
@@ -3694,75 +3662,71 @@
 
 #: ../app/lib/actions/katello/content_view/incremental_updates.rb:48
 msgid "Incremental update specified for composite %{name} version %{version}, but no components updated."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:73
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:72
 msgid "Incremental Update of %{content_view_count} Content View Version(s) "
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:98
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:96
 msgid "with"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:105
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:103
 msgid ", and"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:120
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:118
 msgid " %{errata_count} Errata"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:124
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:122
 msgid " %{modulemd_count} Module Stream(s)"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:128
+#: ../app/lib/actions/katello/content_view/incremental_updates.rb:126
 msgid " %{package_count} Package(s)"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/incremental_updates.rb:132
-msgid " %{puppet_module_count} Puppet Module(s)"
-msgstr ""
-
-#: ../app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb:17
+#: ../app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb:16
 msgid "Incremental Update incomplete."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb:28
+#: ../app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb:27
 msgid "Added Content:"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/promote.rb:9
+#: ../app/lib/actions/katello/content_view/promote.rb:12
 msgid "Cannot promote environment out of sequence. Use force to bypass restriction."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/promote_to_environment.rb:43 action_names.rb:20
+#: ../app/lib/actions/katello/content_view/promote_to_environment.rb:40 action_names.rb:47
 msgid "Promotion to Environment"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/publish.rb:19
+#: ../app/lib/actions/katello/content_view/publish.rb:21
 msgid "Repository label '%s' is not associated with content view."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/publish.rb:23
+#: ../app/lib/actions/katello/content_view/publish.rb:25
 msgid "Content view has repository label '%s' which is not specified in repos_units parameter."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/publish.rb:100 action_names.rb:9
+#: ../app/lib/actions/katello/content_view/publish.rb:90 action_names.rb:46
 msgid "Publish"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/publish.rb:105
+#: ../app/lib/actions/katello/content_view/publish.rb:95
 msgid "Auto Publish - Triggered by '%s'"
 msgstr ""
 
 #: ../app/lib/actions/katello/content_view/remove.rb:79
 msgid "Cannot delete version while it is in environment %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:28
+#: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:45
 msgid "Remove Versions and Associations"
 msgstr ""
 
 #: ../app/lib/actions/katello/content_view/remove.rb:101
 msgid "Either environments or versions must be specified."
@@ -3778,103 +3742,95 @@
 
 #: ../app/lib/actions/katello/content_view/remove_from_environment.rb:13
 msgid "Cannot remove content view from environment. Content view '%{view}' is not in lifecycle environment '%{env}'."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:23
+#: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:44
 msgid "Remove from Environment"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:24
+#: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:43
 msgid "Remove Version"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_puppet_environment/create.rb:7
-msgid "Content View %s  cannot be published without an internal capsule."
-msgstr ""
-
 #: ../app/lib/actions/katello/content_view_version/create_repos.rb:20
 msgid "Create Repositories"
 msgstr ""
 
-#: ../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
+#: ../app/lib/actions/katello/content_view_version/export.rb:31 ../app/lib/actions/katello/repository/export.rb:63 action_names.rb:12
 msgid "Export"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import.rb:8
-msgid "This action will become available after the Pulp 3 content migration"
+#: ../app/lib/actions/katello/content_view_version/import.rb:6
+msgid "Content view not provided in the metadata"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import.rb:26 action_names.rb:14
+#: ../app/lib/actions/katello/content_view_version/import.rb:40 action_names.rb:42
 msgid "Import Content View Version"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import_library.rb:12 action_names.rb:11
+#: ../app/lib/actions/katello/content_view_version/import_library.rb:14 action_names.rb:41
 msgid "Import Default Content View"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:17 action_names.rb:12
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:16 action_names.rb:40
 msgid "Incremental Update"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:318
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:303
 msgid "Content View Version %{id} not in all specified environments %{envs}"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:325
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:310
 msgid "Cannot specify content for composite views"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:328
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:313
 msgid "Cannot specify components for non-composite views"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:336
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:321
 msgid "No Version of Content View %{component} already exists as a component of the composite Content View %{composite} version %{version}"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:399
-msgid "Adding multiple versions of the same Puppet Module is not supported by incremental update.  The following Puppet Modules have duplicate versions in the incremental update content list: %{dup_list}"
-msgstr ""
-
-#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:29
+#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:25
 msgid "Republish Repositories of %{name} %{version}"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:31 action_names.rb:17
+#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:27 action_names.rb:39
 msgid "Republish Version Repositories"
 msgstr ""
 
-#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:15
+#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:38
 msgid "Delete Lifecycle Environment"
 msgstr ""
 
-#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:18
+#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:37
 msgid "Publish Lifecycle Environment Repositories"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/attach_subscriptions.rb:13
 msgid "Register host '%s' before attaching subscriptions"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/attach_subscriptions.rb:47 ../app/lib/actions/katello/host/remove_subscriptions.rb:38 ../app/lib/actions/katello/host/update_content_overrides.rb:30 ../app/lib/actions/katello/sync_plan/run.rb:40 ../app/models/katello/content_view_history.rb:65 ../app/models/katello/content_view_history.rb:67 ../app/models/katello/purpose_status.rb:36
-msgid "Unknown"
-msgstr ""
-
 #: ../app/lib/actions/katello/host/attach_subscriptions.rb:47
 msgid "Attach subscriptions to %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:19
+#: ../app/lib/actions/katello/host/attach_subscriptions.rb:47 ../app/lib/actions/katello/host/remove_subscriptions.rb:38 ../app/lib/actions/katello/host/update_content_overrides.rb:30 ../app/lib/actions/katello/sync_plan/run.rb:40 ../app/models/katello/content_view_history.rb:65 ../app/models/katello/content_view_history.rb:67 ../app/models/katello/purpose_status.rb:36
+msgid "Unknown"
+msgstr ""
+
+#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:36
 msgid "Attach subscriptions"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/destroy.rb:30
 msgid "Destroy Content Host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:22
+#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:34
 msgid "Destroy Content Host"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:10
 msgid "errata_ids or update_all must be provided"
@@ -3882,11 +3838,11 @@
 
 #: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:25
 msgid "No applicable errata for %s, skipping"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:25
+#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:33
 msgid "Install Applicable Errata"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:33
 msgid "Install Applicable Errata on %s"
@@ -3974,11 +3930,11 @@
 
 #: ../app/lib/actions/katello/host/remove_subscriptions.rb:38
 msgid "Remove subscriptions from %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:33
+#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:30
 msgid "Remove subscriptions"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/update_content_overrides.rb:7
 msgid "This Host is not currently registered with subscription-manager."
@@ -3994,11 +3950,11 @@
 
 #: ../app/lib/actions/katello/host/update_content_view.rb:12 ../app/lib/actions/katello/host/update_release_version.rb:15 ../app/lib/actions/katello/host/update_system_purpose.rb:6
 msgid "Host %s has not been registered with subscription-manager."
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:30
+#: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:28
 msgid "Update for host"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/update_content_view.rb:20
 msgid "Update for host %s"
@@ -4006,11 +3962,11 @@
 
 #: ../app/lib/actions/katello/host/update_release_version.rb:9
 msgid "Host %{name} cannot be assigned release version %{release_version}."
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:31
+#: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:27
 msgid "Update release version for host"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/update_release_version.rb:23
 msgid "Update release version for host %s"
@@ -4018,31 +3974,31 @@
 
 #: ../app/lib/actions/katello/host/update_system_purpose.rb:23
 msgid "Updating System Purpose for host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:32
+#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:26
 msgid "Updating System Purpose for host"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/upload_package_profile.rb:20
 msgid "Package Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:61
+#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:25
 msgid "Package Profile Update"
 msgstr ""
 
 #: ../app/lib/actions/katello/host/upload_profiles.rb:22
 msgid "Combined Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:34
+#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:24
 msgid "Combined Profile Update"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:35
+#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:23
 msgid "Destroy"
 msgstr ""
 
 #: ../app/lib/actions/katello/organization/manifest_delete.rb:37
 msgid "Delete Manifest"
@@ -4054,19 +4010,19 @@
 
 #: ../app/lib/actions/katello/organization/manifest_import.rb:44
 msgid "Import Manifest"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/manifest_import.rb:49
+#: ../app/lib/actions/katello/organization/manifest_import.rb:55
 msgid "Manifest imported"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/manifest_refresh.rb:59
+#: ../app/lib/actions/katello/organization/manifest_refresh.rb:70
 msgid "Refresh Manifest"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/manifest_refresh.rb:65
+#: ../app/lib/actions/katello/organization/manifest_refresh.rb:86
 msgid "Manifest refreshed"
 msgstr ""
 
 #: ../app/lib/actions/katello/organization/simple_content_access/disable.rb:11
 msgid "Disable Simple Content Access"
@@ -4078,11 +4034,11 @@
 
 #: ../app/lib/actions/katello/product/content_destroy.rb:6
 msgid "Cannot delete redhat product content"
 msgstr ""
 
-#: ../app/lib/actions/katello/product/create.rb:38 action_names.rb:36
+#: ../app/lib/actions/katello/product/create.rb:37 action_names.rb:22
 msgid "Product Create"
 msgstr ""
 
 #: ../app/lib/actions/katello/product/destroy.rb:13
 msgid "Cannot delete Red Hat product: %{product}"
@@ -4090,11 +4046,11 @@
 
 #: ../app/lib/actions/katello/product/destroy.rb:15
 msgid "Cannot delete product with repositories published in a content view.  Product: %{product}, %{view_versions}"
 msgstr ""
 
-#: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:37
+#: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:21
 msgid "Delete Product"
 msgstr ""
 
 #: ../app/lib/actions/katello/product/destroy.rb:97
 msgid "Content View %{view}: Versions: %{versions}"
@@ -4106,11 +4062,11 @@
 
 #: ../app/lib/actions/katello/provider/destroy.rb:7
 msgid "Cannot delete provider with attached products"
 msgstr ""
 
-#: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:188 action_names.rb:8
+#: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:188 action_names.rb:18
 msgid "Update"
 msgstr ""
 
 #: ../app/lib/actions/katello/repository/capsule_sync.rb:6
 msgid "Sync Repository on Smart Proxy(ies)"
@@ -4122,11 +4078,11 @@
 
 #: ../app/lib/actions/katello/repository/clone_to_version.rb:17
 msgid "Cannot publish a link repository if multiple component clones are specified"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:40
+#: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:15
 msgid "Delete Package Group"
 msgstr ""
 
 #: ../app/lib/actions/katello/repository/export.rb:14
 msgid "Unable to export, 'pulp_export_destination' setting is not set to a valid directory."
@@ -4134,11 +4090,11 @@
 
 #: ../app/lib/actions/katello/repository/export.rb:18
 msgid "Unable to export. 'pulp_export_destination' setting is not a writable directory."
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/import_upload.rb:60 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:43
+#: ../app/lib/actions/katello/repository/import_upload.rb:59 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:9
 msgid "Upload into"
 msgstr ""
 
 #: ../app/lib/actions/katello/repository/remove_content.rb:11
 msgid "Cannot remove content from a non-custom repository"
@@ -4146,63 +4102,63 @@
 
 #: ../app/lib/actions/katello/repository/remove_content.rb:14
 msgid "Can only remove content from within the Default Content View"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:50
+#: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:3
 msgid "Remove Content"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:31
+#: ../app/lib/actions/katello/repository/sync.rb:33
 msgid "Unable to sync repo. This repository does not have a feed url."
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:32
+#: ../app/lib/actions/katello/repository/sync.rb:34
 msgid "Cannot validate contents on non-yum/deb repositories."
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:33
+#: ../app/lib/actions/katello/repository/sync.rb:35
 msgid "Cannot skip metadata check on non-yum repositories."
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:94
+#: ../app/lib/actions/katello/repository/sync.rb:96
 msgid "Synchronize: Validate Content"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:96
+#: ../app/lib/actions/katello/repository/sync.rb:98
 msgid "Synchronize: Skip Metadata Check"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:98 action_names.rb:51
+#: ../app/lib/actions/katello/repository/sync.rb:100 action_names.rb:2
 msgid "Synchronize"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:55
+#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:72
 msgid "Upload errata into"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:56
+#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:68
 msgid "Create Package Group"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:58
+#: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:69
 msgid "Disable"
 msgstr ""
 
 #: ../app/lib/actions/katello/repository_set/disable_repository.rb:17
 msgid "Repository not found"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:59
+#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:71
 msgid "Enable"
 msgstr ""
 
 #: ../app/lib/actions/katello/repository_set/enable_repository.rb:15
 msgid "The repository is already enabled"
 msgstr ""
 
-#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:60
+#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:67
 msgid "Run Sync Plan:"
 msgstr ""
 
 #: ../app/lib/actions/katello/upstream_subscriptions/bind_entitlement.rb:11
 msgid "Bind an entitlement to an allocation"
@@ -4274,15 +4230,15 @@
 
 #: ../app/lib/actions/pulp/consumer/unassociate_units.rb:11
 msgid "Unassociate units in repository"
 msgstr ""
 
-#: ../app/lib/actions/pulp/repository/distributor_publish.rb:28
+#: ../app/lib/actions/pulp/repository/distributor_publish.rb:20
 msgid "Repository metadata publish"
 msgstr ""
 
-#: ../app/lib/actions/pulp/repository/presenters/docker_presenter.rb:30 ../app/lib/actions/pulp/repository/presenters/file_unit_presenter.rb:14 ../app/lib/actions/pulp/repository/presenters/puppet_presenter.rb:14 ../app/lib/actions/pulp/repository/presenters/yum_presenter.rb:18 ../app/lib/actions/pulp3/repository/presenters/content_unit_presenter.rb:14 ../app/lib/actions/pulp3/repository/presenters/repair_presenter.rb:41
+#: ../app/lib/actions/pulp/repository/presenters/docker_presenter.rb:30 ../app/lib/actions/pulp/repository/presenters/file_unit_presenter.rb:14 ../app/lib/actions/pulp/repository/presenters/yum_presenter.rb:18 ../app/lib/actions/pulp3/repository/presenters/content_unit_presenter.rb:14 ../app/lib/actions/pulp3/repository/presenters/repair_presenter.rb:41
 msgid "Cancelled."
 msgstr ""
 
 #: ../app/lib/actions/pulp/repository/presenters/docker_presenter.rb:34
 msgid "New blobs: %{count}."
@@ -4314,20 +4270,10 @@
 
 #: ../app/lib/actions/pulp/repository/presenters/ostree_presenter.rb:47
 msgid "Branches updated"
 msgstr ""
 
-#: ../app/lib/actions/pulp/repository/presenters/puppet_presenter.rb:17
-msgid "Total module count: %s."
-msgstr ""
-
-#: ../app/lib/actions/pulp/repository/presenters/puppet_presenter.rb:21
-msgid "Failed to download %s module."
-msgid_plural "Failed to download %s modules."
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../app/lib/actions/pulp/repository/presenters/yum_presenter.rb:21
 msgid "Pending"
 msgstr ""
 
 #: ../app/lib/actions/pulp/repository/presenters/yum_presenter.rb:24
@@ -4368,33 +4314,29 @@
 
 #: ../app/lib/actions/pulp/repository_group/create.rb:22
 msgid "Group %{id} already created."
 msgstr ""
 
-#: ../app/lib/actions/pulp3/content_migration.rb:19
-msgid "Content Migration"
+#: ../app/lib/actions/pulp3/content_view_version/create_export_history.rb:52 action_names.rb:66
+msgid "Create Export History"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/content_migration_reset.rb:14
-msgid "Content Migration Reset"
+#: ../app/lib/actions/pulp3/content_view_version/create_import_history.rb:29 action_names.rb:65
+msgid "Create Import History"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/orchestration/content_view_version/export.rb:27
-msgid "Unable to export. 'pulpcore_export_destination' setting is not set to a valid directory."
-msgstr ""
-
 #: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:63
 msgid "Export Library"
 msgstr ""
 
 #: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:47
 msgid ""
 "NOTE: Unable to fully export '%{organization}' organization's library because it contains repositories without the 'immediate' download policy. Update the download policy and sync affected repositories to include them in the export. \n"
 " %{repos}"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:37 action_names.rb:64
+#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:49 action_names.rb:62
 msgid "Import"
 msgstr ""
 
 #: ../app/lib/actions/pulp3/orchestration/repository/trigger_update_repo_cert_guard.rb:16 ../app/lib/actions/pulp3/repository/update_cv_repository_cert_guard.rb:14
 msgid "Updating repository authentication configuration"
@@ -4422,51 +4364,51 @@
 
 #: ../app/lib/katello/errors.rb:87
 msgid "No errors"
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:126 ../app/services/katello/pulp3/task.rb:86
+#: ../app/lib/katello/errors.rb:121 ../app/services/katello/pulp3/task.rb:92
 msgid "Task canceled"
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:128 ../app/services/katello/pulp3/task.rb:89
+#: ../app/lib/katello/errors.rb:123 ../app/services/katello/pulp3/task.rb:95
 msgid "Pulp task error"
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:137
+#: ../app/lib/katello/errors.rb:132
 msgid "The Subscription Allocation providing the imported manifest has been removed. Please create a new Subscription Allocation and import the new manifest."
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:146
+#: ../app/lib/katello/errors.rb:141
 msgid "No URL found for a container registry. Please check the configuration."
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:152
+#: ../app/lib/katello/errors.rb:147
 msgid "You are currently operating in disconnected mode where access to Red Hat Subcription Management is prohibited. If you would like to change this, please update the content setting 'Disconnected mode'."
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:159
+#: ../app/lib/katello/errors.rb:154
 msgid "Current organization has no manifest imported."
 msgstr ""
 
-#: ../app/lib/katello/errors.rb:165
+#: ../app/lib/katello/errors.rb:160
 msgid "This Organization's subscription manifest has expired. Please import a new manifest."
 msgstr ""
 
 #: ../app/lib/katello/http_resource.rb:93 ../app/lib/katello/http_resource.rb:107 ../app/lib/katello/http_resource.rb:121 ../app/lib/katello/http_resource.rb:135
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
-#: ../app/lib/katello/repo_discovery.rb:35
+#: ../app/lib/katello/repo_discovery.rb:37
 msgid "Unsupported URL protocol %s."
 msgstr ""
 
-#: ../app/lib/katello/resources/candlepin.rb:126 ../app/models/katello/glue/provider.rb:63 ../app/models/katello/glue/provider.rb:86
+#: ../app/lib/katello/resources/candlepin.rb:136 ../app/models/katello/glue/provider.rb:63 ../app/models/katello/glue/provider.rb:86
 msgid "Upstream identity certificate not available"
 msgstr ""
 
-#: ../app/lib/katello/resources/candlepin.rb:143
+#: ../app/lib/katello/resources/candlepin.rb:153
 msgid "Current organization not set."
 msgstr ""
 
 #: ../app/lib/katello/resources/cdn.rb:120
 msgid "CDN loading error: %s not found"
@@ -5038,34 +4980,10 @@
 
 #: ../app/lib/katello/validators/content_view_filter_version_validator.rb:6
 msgid "Invalid filter rule specified, 'version' cannot be specified in the same tuple as 'min_version' or 'max_version'"
 msgstr ""
 
-#: ../app/lib/katello/validators/content_view_puppet_module_validator.rb:6
-msgid ""
-"Invalid puppet module parameters specified. \\\n"
-"                                    Either 'uuid' or 'name' and 'author' must be specified."
-msgstr ""
-
-#: ../app/lib/katello/validators/content_view_puppet_module_validator.rb:10
-msgid ""
-"Puppet Module with name='%{name}' and author='%{author}' does\\\n"
-"                                    not exist"
-msgstr ""
-
-#: ../app/lib/katello/validators/content_view_puppet_module_validator.rb:13
-msgid ""
-"Puppet Module with uuid='%{uuid}' does not\\\n"
-"                                    exist"
-msgstr ""
-
-#: ../app/lib/katello/validators/content_view_puppet_module_validator.rb:25
-msgid ""
-"Puppet Module does not belong to content view organization\\\n"
-"                                      '%{name}'"
-msgstr ""
-
 #: ../app/lib/katello/validators/environment_docker_repositories_validator.rb:8
 msgid "Registry name pattern will result in invalid container image name of member repositories"
 msgstr ""
 
 #: ../app/lib/katello/validators/environment_docker_repositories_validator.rb:27
@@ -5091,30 +5009,26 @@
 #: ../app/lib/katello/validators/gpg_key_content_validator.rb:36
 msgid "must contain valid  Public GPG Key"
 msgstr ""
 
 #: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:8
-msgid "The selected content source and lifecycle environment do not match"
-msgstr ""
-
-#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:14
 msgid "Please select a content source before assigning a kickstart repository"
 msgstr ""
 
-#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:16
+#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:10
 msgid "Please select an operating system before assigning a kickstart repository"
 msgstr ""
 
-#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:18
+#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:12
 msgid "Kickstart repositories can only be assigned to hosts in the Red Hat family"
 msgstr ""
 
-#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:20
+#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:14
 msgid "Please select an architecture before assigning a kickstart repository"
 msgstr ""
 
-#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:22
+#: ../app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb:16
 msgid ""
 "The selected kickstart repository is not part of the assigned content view, lifecycle environment,\n"
 "                  content source, operating system, and architecture"
 msgstr ""
 
@@ -5232,211 +5146,199 @@
 
 #: ../app/models/katello/activation_key.rb:78
 msgid "name: %s doesn't exist "
 msgstr ""
 
-#: ../app/models/katello/activation_key.rb:150 ../app/views/overrides/activation_keys/_host_tab.html.erb:2 ../app/views/overrides/activation_keys/_host_tab_pane.html.erb:10 ../lib/katello/plugin.rb:85 ../webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js:30
+#: ../app/models/katello/activation_key.rb:150 ../app/views/overrides/activation_keys/_host_tab.html.erb:2 ../app/views/overrides/activation_keys/_host_tab_pane.html.erb:10 ../lib/katello/plugin.rb:85 ../webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js:47 ../webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js:30
 msgid "Activation Keys"
 msgstr ""
 
 #: ../app/models/katello/capsule_lifecycle_environment.rb:8
 msgid "is already attached to the capsule"
 msgstr ""
 
-#: ../app/models/katello/concerns/host_managed_extensions.rb:58
+#: ../app/models/katello/concerns/host_managed_extensions.rb:57
 msgid "Content_Host_Status"
 msgstr ""
 
-#: ../app/models/katello/concerns/host_managed_extensions.rb:114
+#: ../app/models/katello/concerns/host_managed_extensions.rb:113
 msgid "Mark Content Host Statuses as Unknown for %s"
 msgstr ""
 
-#: ../app/models/katello/concerns/location_extensions.rb:37
-msgid "Cannot delete the last Location. Foreman needs at least one Location to put newly published Puppet content and Hosts registered via subscription-manager"
+#: ../app/models/katello/concerns/location_extensions.rb:34
+msgid "Cannot delete the last Location."
 msgstr ""
 
-#: ../app/models/katello/concerns/location_extensions.rb:44
+#: ../app/models/katello/concerns/location_extensions.rb:39
 msgid "Cannot delete the default Location for subscribed hosts. If you no longer want this Location, change the default Location for subscribed hosts under Administer > Settings, tab Content."
 msgstr ""
 
-#: ../app/models/katello/concerns/location_extensions.rb:52
-msgid "Cannot delete the default Location for Puppet content. If you no longer want this Location, change the default Location for Puppet content under Administer > Settings, tab Content."
-msgstr ""
-
-#: ../app/models/katello/concerns/location_extensions.rb:76
-msgid "Setting 'default_location_puppet_content' is not set to a valid location."
-msgstr ""
-
-#: ../app/models/katello/concerns/location_extensions.rb:86
+#: ../app/models/katello/concerns/location_extensions.rb:63
 msgid "Setting 'default_location_subscribed_hosts' is not set to a valid location."
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:132
+#: ../app/models/katello/concerns/organization_extensions.rb:122
 msgid "Could not delete organization '%s'."
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:134
+#: ../app/models/katello/concerns/organization_extensions.rb:124
 msgid "The current organization cannot be deleted. Please switch to a different organization before deleting."
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:136
+#: ../app/models/katello/concerns/organization_extensions.rb:126
 msgid "At least one organization must exist."
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:161
+#: ../app/models/katello/concerns/organization_extensions.rb:151
 msgid "Informable Type must be one of the following [ %{list} ]"
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:199
+#: ../app/models/katello/concerns/organization_extensions.rb:185
 msgid "You cannot set an organization's parent. This feature is disabled."
 msgstr ""
 
-#: ../app/models/katello/concerns/organization_extensions.rb:203
+#: ../app/models/katello/concerns/organization_extensions.rb:189
 msgid "You cannot set an organization's parent_id. This feature is disabled."
 msgstr ""
 
-#: ../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
+#: ../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:20 ../app/models/katello/root_repository.rb:85 ../app/models/katello/root_repository.rb:89 ../app/models/katello/root_repository.rb:93
 msgid "must be one of the following: %s"
 msgstr ""
 
 #: ../app/models/katello/concerns/smart_proxy_extensions.rb:80
 msgid "Could not find a smart proxy with pulp feature."
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:327
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:325
 msgid "Could not remove the lifecycle environment from the smart proxy"
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:330
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:328
 msgid "Lifecycle environment was not attached to the smart proxy; therefore, no changes were made."
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:368 ../app/models/katello/concerns/smart_proxy_extensions.rb:374
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:366 ../app/models/katello/concerns/smart_proxy_extensions.rb:372
 msgid "%s is unreachable. %s"
 msgstr ""
 
 #: ../app/models/katello/content.rb:48
 msgid "Product with ID %s not found in Candlepin. Skipping content import for it."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:421
+#: ../app/models/katello/content_view.rb:406
 msgid "Cannot delete view while it exists in environments"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:426
+#: ../app/models/katello/content_view.rb:411
 msgid "Cannot delete from %s, view does not exist there."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:464 ../app/models/katello/content_view_version_component.rb:13
+#: ../app/models/katello/content_view.rb:441 ../app/models/katello/content_view_version_component.rb:13
 msgid "Cannot add component versions to a non-composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:470
+#: ../app/models/katello/content_view.rb:447
 msgid "Cannot set auto publish to a non-composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:478
-msgid "Puppet module conflict: '%{mod}' is in %{versions}."
-msgstr ""
-
-#: ../app/models/katello/content_view.rb:485
+#: ../app/models/katello/content_view.rb:453
 msgid "Container Image repo '%{repo}' is present in multiple component content views."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:600
+#: ../app/models/katello/content_view.rb:516
 msgid "Cannot import a composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:601
+#: ../app/models/katello/content_view.rb:517
 msgid "This Content View must be set to Import-only before performing an import"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:606
+#: ../app/models/katello/content_view.rb:522
 msgid "User must be logged in."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:607
+#: ../app/models/katello/content_view.rb:523
 msgid "Cannot publish default content view"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:612
+#: ../app/models/katello/content_view.rb:528
 msgid "Import-only content views can not be published directly"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:630
+#: ../app/models/katello/content_view.rb:546
 msgid "Consider changing the Lifecycle Environment's Registry Name Pattern to something more specific."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:640
+#: ../app/models/katello/content_view.rb:556
 msgid "Make sure all the component content views are published before publishing/promoting the composite content view. This restriction is optional and can be modified in the Administrator -> Settings -> Content page using the restrict_composite_view flag."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:650
+#: ../app/models/katello/content_view.rb:566
 msgid "The action requested on this composite view cannot be performed until all of the component content view versions have been promoted to the target environment: %{env}.  This restriction is optional and can be modified in the Administrator -> Settings -> Content page using the restrict_composite_view flag."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:664 ../app/models/katello/content_view.rb:683
+#: ../app/models/katello/content_view.rb:580 ../app/models/katello/content_view.rb:599
 msgid "hosts"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:665 ../app/models/katello/content_view.rb:684
+#: ../app/models/katello/content_view.rb:581 ../app/models/katello/content_view.rb:600
 msgid "activation keys"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:670
+#: ../app/models/katello/content_view.rb:586
 msgid "Cannot remove '%{view}' from environment '%{env}' due to associated %{dependent}: %{names}."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:682
+#: ../app/models/katello/content_view.rb:598
 msgid "environments"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:689
+#: ../app/models/katello/content_view.rb:605
 msgid "Cannot delete '%{view}' due to associated %{dependent}: %{names}."
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:699 ../app/views/dashboard/_content_views_widget.html.erb:2 ../lib/katello/plugin.rb:76 ../lib/katello/plugin.rb:217 ../webpack/containers/Application/config.js:57 ../webpack/scenes/ContentViews/ContentViewsPage.js:19
+#: ../app/models/katello/content_view.rb:615 ../app/views/dashboard/_content_views_widget.html.erb:2 ../lib/katello/plugin.rb:76 ../lib/katello/plugin.rb:206 ../webpack/containers/Application/config.js:57 ../webpack/scenes/ContentViews/ContentViewsPage.js:19 ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:38
 msgid "Content Views"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:727
+#: ../app/models/katello/content_view.rb:643
 msgid "Import-only can not be changed after creation"
 msgstr ""
 
-#: ../app/models/katello/content_view.rb:750
+#: ../app/models/katello/content_view.rb:666
 msgid "cannot be deleted if it has been promoted."
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:36
+#: ../app/models/katello/content_view_component.rb:41
 msgid "Invalid association of the content view id. Content View must match the content view version being saved"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:40
+#: ../app/models/katello/content_view_component.rb:45
 msgid "Cannot add composite versions to a composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:44 ../app/models/katello/content_view_version_component.rb:21
+#: ../app/models/katello/content_view_component.rb:49 ../app/models/katello/content_view_version_component.rb:21
 msgid "Cannot add default content view to composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:48
+#: ../app/models/katello/content_view_component.rb:53
 msgid "Another component already includes content view with ID %s"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:54
+#: ../app/models/katello/content_view_component.rb:59
 msgid "Either set the content view with the latest flag or set the content view version"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:56
+#: ../app/models/katello/content_view_component.rb:61
 msgid "Cannot associate a component to a non composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:59
+#: ../app/models/katello/content_view_component.rb:64
 msgid "Either set the latest content view or the content view version. Cannot set both"
 msgstr ""
 
-#: ../app/models/katello/content_view_component.rb:62
+#: ../app/models/katello/content_view_component.rb:67
 msgid "Content View Version not set"
 msgstr ""
 
 #: ../app/models/katello/content_view_erratum_filter.rb:5
 msgid "Bug Fix"
@@ -5448,11 +5350,11 @@
 
 #: ../app/models/katello/content_view_erratum_filter.rb:7 ../app/views/katello/errata_mailer/_host_dashboard.html.erb:9 ../app/views/katello/errata_mailer/host_errata.html.erb:47 ../app/views/katello/errata_mailer/host_errata.text.erb:9 ../app/views/katello/errata_mailer/promote_errata.text.erb:12 ../app/views/katello/errata_mailer/sync_errata.text.erb:10
 msgid "Security"
 msgstr ""
 
-#: ../app/models/katello/content_view_filter.rb:12 ../lib/katello/plugin.rb:141
+#: ../app/models/katello/content_view_filter.rb:12 ../lib/katello/plugin.rb:141 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:34
 msgid "Packages"
 msgstr ""
 
 #: ../app/models/katello/content_view_filter.rb:12 ../lib/katello/plugin.rb:159 ../webpack/containers/Application/config.js:41 ../webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js:52 ../webpack/scenes/ModuleStreams/ModuleStreamsPage.js:51
 msgid "Module Streams"
@@ -5460,11 +5362,11 @@
 
 #: ../app/models/katello/content_view_filter.rb:12
 msgid "Package Groups"
 msgstr ""
 
-#: ../app/models/katello/content_view_filter.rb:12 ../app/models/katello/errata_status.rb:9 ../app/views/dashboard/_errata_widget.html.erb:16 ../lib/katello/plugin.rb:150 ../webpack/scenes/ContentViews/Details/Filters/ContentType.js:14
+#: ../app/models/katello/content_view_filter.rb:12 ../app/models/katello/errata_status.rb:9 ../app/views/dashboard/_errata_widget.html.erb:16 ../lib/katello/plugin.rb:150 ../webpack/scenes/ContentViews/Details/Filters/ContentType.js:14 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:35
 msgid "Errata"
 msgstr ""
 
 #: ../app/models/katello/content_view_filter.rb:12
 msgid "Container Images"
@@ -5520,54 +5422,54 @@
 
 #: ../app/models/katello/content_view_history.rb:80
 msgid "Success"
 msgstr ""
 
-#: ../app/models/katello/content_view_puppet_module.rb:8
-msgid "There is already a module named \"%{value}\" in this content view."
+#: ../app/models/katello/content_view_repository.rb:19
+msgid "already belongs to the content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_puppet_module.rb:56
-msgid "Couldn't find Puppet Module with id '%s'"
-msgstr ""
-
-#: ../app/models/katello/content_view_repository.rb:29
+#: ../app/models/katello/content_view_repository.rb:28
 msgid "Cannot add repositories to a composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_repository.rb:35
+#: ../app/models/katello/content_view_repository.rb:34
 msgid "Cannot add %s repositories to a content view."
 msgstr ""
 
-#: ../app/models/katello/content_view_repository.rb:41
+#: ../app/models/katello/content_view_repository.rb:40
 msgid "Cannot add a repository from an Organization other than %s."
 msgstr ""
 
-#: ../app/models/katello/content_view_repository.rb:45
+#: ../app/models/katello/content_view_repository.rb:44
 msgid "Repositories from published Content Views are not allowed."
 msgstr ""
 
-#: ../app/models/katello/content_view_version.rb:52
+#: ../app/models/katello/content_view_version.rb:50
 msgid ", must be unique to major and version id version."
 msgstr ""
 
-#: ../app/models/katello/content_view_version.rb:334
+#: ../app/models/katello/content_view_version.rb:310
 msgid "Default content view versions cannot be promoted"
 msgstr ""
 
-#: ../app/models/katello/content_view_version.rb:342
+#: ../app/models/katello/content_view_version.rb:318
 msgid "Cannot delete version while it is in environments: %s"
 msgstr ""
 
-#: ../app/models/katello/content_view_version.rb:347 ../app/models/katello/content_view_version.rb:355
+#: ../app/models/katello/content_view_version.rb:323 ../app/models/katello/content_view_version.rb:331
 msgid "Cannot delete version while it is in use by composite content views: %s"
 msgstr ""
 
 #: ../app/models/katello/content_view_version_component.rb:17
 msgid "Cannot add composite versions to another composite content view"
 msgstr ""
 
+#: ../app/models/katello/content_view_version_import_history.rb:35
+msgid "Content imported from %{path} into content view '%{name}' by %{user}"
+msgstr ""
+
 #: ../app/models/katello/errata_status.rb:27
 msgid "Security errata installable"
 msgstr ""
 
 #: ../app/models/katello/errata_status.rb:27
@@ -5624,11 +5526,11 @@
 
 #: ../app/models/katello/gpg_key.rb:49 ../lib/katello/plugin.rb:39
 msgid "Content Credentials"
 msgstr ""
 
-#: ../app/models/katello/host/subscription_facet.rb:241
+#: ../app/models/katello/host/subscription_facet.rb:243
 msgid "register_hostname_fact set for %s, but no fact found, or was localhost."
 msgstr ""
 
 #: ../app/models/katello/host_collection.rb:15
 msgid "Organization cannot be blank."
@@ -5648,91 +5550,95 @@
 
 #: ../app/models/katello/host_collection.rb:33
 msgid "may not be less than the number of hosts associated with the host collection."
 msgstr ""
 
-#: ../app/models/katello/host_collection.rb:102 ../app/views/dashboard/_host_collection_widget.html.erb:2 ../lib/katello/plugin.rb:203
+#: ../app/models/katello/host_collection.rb:102 ../app/views/dashboard/_host_collection_widget.html.erb:2 ../lib/katello/plugin.rb:192
 msgid "Host Collections"
 msgstr ""
 
 #: ../app/models/katello/host_collection_hosts.rb:13
 msgid "You cannot have more than %{max_hosts} host(s) associated with host collection '%{host_collection}'."
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:46 ../app/models/katello/kt_environment.rb:49
+#: ../app/models/katello/kt_environment.rb:44 ../app/models/katello/kt_environment.rb:47
 msgid "of environment must be unique within one organization"
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:47 ../app/models/katello/kt_environment.rb:50 ../app/models/katello/kt_environment.rb:51
+#: ../app/models/katello/kt_environment.rb:45 ../app/models/katello/kt_environment.rb:48 ../app/models/katello/kt_environment.rb:49
 msgid ": '%s' is a built-in environment"
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:123
+#: ../app/models/katello/kt_environment.rb:121
 msgid "An environment is missing a prior"
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:178
+#: ../app/models/katello/kt_environment.rb:176
 msgid "Library lifecycle environments may not be deleted."
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:183
+#: ../app/models/katello/kt_environment.rb:181
 msgid "Lifecycle Environment %s has associated Hosts. Please unregister or move the associated Hosts before trying to delete this lifecycle environment."
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:189
+#: ../app/models/katello/kt_environment.rb:187
 msgid "Lifecycle Environment %s has associated Activation Keys. Please change or remove the associated Activation Keys before trying to delete this lifecycle environment."
 msgstr ""
 
-#: ../app/models/katello/kt_environment.rb:257 ../app/views/overrides/activation_keys/_host_environment_select.html.erb:13
+#: ../app/models/katello/kt_environment.rb:251 ../app/views/overrides/activation_keys/_host_environment_select.html.erb:13
 msgid "Lifecycle Environment"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:55
+#: ../app/models/katello/ping.rb:56
 msgid "Not running"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:105
+#: ../app/models/katello/ping.rb:106
 msgid "Skipped pulp_auth check after failed pulp check"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:123
+#: ../app/models/katello/ping.rb:124
 msgid "foreman-tasks service not running or is not ready yet"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:129
+#: ../app/models/katello/ping.rb:130
 msgid "some executors are not responding, check %{status_url}"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:136
+#: ../app/models/katello/ping.rb:137
 msgid "Candlepin is not running properly"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:174 ../app/models/katello/ping.rb:193
+#: ../app/models/katello/ping.rb:175 ../app/models/katello/ping.rb:194
 msgid "Pulp does not appear to be running at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:177 ../app/models/katello/ping.rb:196
+#: ../app/models/katello/ping.rb:178 ../app/models/katello/ping.rb:197
 msgid "Pulp database connection issue at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:181
+#: ../app/models/katello/ping.rb:182
 msgid "Pulp message bus connection issue at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:185 ../app/models/katello/ping.rb:207
+#: ../app/models/katello/ping.rb:186 ../app/models/katello/ping.rb:208
 msgid "Not all necessary pulp workers running at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:200
+#: ../app/models/katello/ping.rb:201
 msgid "Pulp redis connection issue at %s."
 msgstr ""
 
+#: ../app/models/katello/pool.rb:59
+msgid "A Pool and its Subscription cannot belong to different organizations"
+msgstr ""
+
 #: ../app/models/katello/product.rb:113 ../app/views/katello/errata_mailer/promote_errata.html.erb:52
 msgid "None"
 msgstr ""
 
-#: ../app/models/katello/product.rb:236
+#: ../app/models/katello/product.rb:230
 msgid "Product and Repositories"
 msgstr ""
 
 #: ../app/models/katello/provider.rb:43
 msgid "Only one Red Hat provider permitted for an Organization"
@@ -5740,31 +5646,19 @@
 
 #: ../app/models/katello/provider.rb:62
 msgid "the following attributes can not be updated for the Red Hat provider: [ %s ]"
 msgstr ""
 
-#: ../app/models/katello/pulp_sync_status.rb:94
+#: ../app/models/katello/pulp_sync_status.rb:84
 msgid "One or more packages failed to sync properly."
 msgstr ""
 
-#: ../app/models/katello/puppet_module.rb:48
-msgid "Invalid puppet module. Please make sure the puppet module contains a metadata.json file and is properly compressed."
-msgstr ""
-
-#: ../app/models/katello/puppet_module.rb:51
-msgid "Could not unarchive puppet module. Please make sure the puppet module has been compressed properly."
-msgstr ""
-
-#: ../app/models/katello/puppet_module.rb:64
-msgid "Could not find Repository for module %s."
-msgstr ""
-
 #: ../app/models/katello/purpose_addons_status.rb:5
 msgid "Addons"
 msgstr ""
 
-#: ../app/models/katello/purpose_role_status.rb:5 ../webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js:6
+#: ../app/models/katello/purpose_role_status.rb:5
 msgid "Role"
 msgstr ""
 
 #: ../app/models/katello/purpose_sla_status.rb:5
 msgid "Service Level"
@@ -5788,119 +5682,119 @@
 
 #: ../app/models/katello/purpose_usage_status.rb:5
 msgid "Usage"
 msgstr ""
 
-#: ../app/models/katello/repository.rb:116
+#: ../app/models/katello/repository.rb:114
 msgid "for repository '%{name}' is not unique and cannot be created in '%{env}'. Its Container Repository Name (%{container_name}) conflicts with an existing repository.  Consider changing the Lifecycle Environment's Registry Name Pattern to something more specific."
 msgstr ""
 
-#: ../app/models/katello/repository.rb:215
+#: ../app/models/katello/repository.rb:219
 msgid "Successfully synchronized."
 msgstr ""
 
-#: ../app/models/katello/repository.rb:510
+#: ../app/models/katello/repository.rb:514
 msgid "Cannot clone into the Default Content View"
 msgstr ""
 
-#: ../app/models/katello/repository.rb:517
+#: ../app/models/katello/repository.rb:521
 msgid "View %{view} has not been promoted to %{env}"
 msgstr ""
 
-#: ../app/models/katello/repository.rb:522
+#: ../app/models/katello/repository.rb:526
 msgid "Repository has already been cloned to %{cv_name} in environment %{to_env}"
 msgstr ""
 
-#: ../app/models/katello/repository.rb:713
+#: ../app/models/katello/repository.rb:705
 msgid "Duplicate branches specified - %{branches}"
 msgstr ""
 
-#: ../app/models/katello/repository.rb:727
+#: ../app/models/katello/repository.rb:719
 msgid "Repository cannot be deleted since it has already been included in a published Content View. Please delete all Content View versions containing this repository before attempting to delete it."
 msgstr ""
 
-#: ../app/models/katello/repository.rb:778
+#: ../app/models/katello/repository.rb:770
 msgid "This is not a linked repository"
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:134
+#: ../app/models/katello/root_repository.rb:133
 msgid "Cannot set attribute %{attr} for content type %{type}"
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:142
-msgid "Cannot sync file:// repositories with On Demand or Background Download Policies"
+#: ../app/models/katello/root_repository.rb:141
+msgid "Cannot sync file:// repositories with the On Demand Download Policy"
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:148
+#: ../app/models/katello/root_repository.rb:147
 msgid "cannot be blank when Repository URL is provided."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:149
+#: ../app/models/katello/root_repository.rb:148
 msgid "Upstream Name cannot be blank when Repository URL is provided."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:155
+#: ../app/models/katello/root_repository.rb:154
 msgid "Container Image Repositories are not protected at this time. They need to be published via http to be available to containers."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:162
+#: ../app/models/katello/root_repository.rb:161
 msgid "cannot be set for non-yum repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:168
+#: ../app/models/katello/root_repository.rb:167
 msgid "Checksum type cannot be set for yum repositories with on demand download policy."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:174
+#: ../app/models/katello/root_repository.rb:173
 msgid "OSTree Repositories cannot be unprotected."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:202
+#: ../app/models/katello/root_repository.rb:201
 msgid "cannot be set for non-ostree repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:209
+#: ../app/models/katello/root_repository.rb:208
 msgid "Ignorable content can be only set for Yum repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:211
+#: ../app/models/katello/root_repository.rb:210
 msgid "Invalid value specified for ignorable content."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:213
+#: ../app/models/katello/root_repository.rb:212
 msgid "Invalid value specified for ignorable content. Permissible values %s"
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:220
+#: ../app/models/katello/root_repository.rb:219
 msgid "Invalid value specified for Container Image repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:230
+#: ../app/models/katello/root_repository.rb:229
 msgid "are only allowed for Yum repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:233
+#: ../app/models/katello/root_repository.rb:232
 msgid "invalid: Repositories can only require one OS version."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:237
+#: ../app/models/katello/root_repository.rb:236
 msgid "must be one of: %s"
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:245
+#: ../app/models/katello/root_repository.rb:244
 msgid "Upstream username and password may only be set on custom repositories."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:247
+#: ../app/models/katello/root_repository.rb:246
 msgid "Upstream password requires upstream username be set."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:249
+#: ../app/models/katello/root_repository.rb:248
 msgid "Upstream username requires upstream password be set."
 msgstr ""
 
-#: ../app/models/katello/root_repository.rb:327
+#: ../app/models/katello/root_repository.rb:322
 msgid "Cannot calculate name for custom repos"
 msgstr ""
 
 #: ../app/models/katello/subscription.rb:58 ../app/models/katello/subscription_status.rb:11
 msgid "Subscription"
@@ -5928,39 +5822,39 @@
 
 #: ../app/models/katello/subscription_status.rb:27
 msgid "Unknown subscription status"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:51
+#: ../app/models/katello/sync_plan.rb:58
 msgid "Can not add product %s because it is disabled."
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:56
+#: ../app/models/katello/sync_plan.rb:63
 msgid "Custom cron expression only needs to be set for interval value of custom cron"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:70
+#: ../app/models/katello/sync_plan.rb:77
 msgid "No recurring logic tied to the sync plan."
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:121
+#: ../app/models/katello/sync_plan.rb:128
 msgid "Start Date and Time can't be blank"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:138 ../lib/katello/plugin.rb:48
+#: ../app/models/katello/sync_plan.rb:145 ../lib/katello/plugin.rb:48
 msgid "Sync Plans"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:145
+#: ../app/models/katello/sync_plan.rb:152
 msgid "Interval cannot be nil"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:156
+#: ../app/models/katello/sync_plan.rb:163
 msgid "Interval not set correctly"
 msgstr ""
 
-#: ../app/models/katello/sync_plan.rb:161
+#: ../app/models/katello/sync_plan.rb:168
 msgid "Cron expression is not valid!"
 msgstr ""
 
 #: ../app/models/katello/sync_plan_task_group.rb:6
 msgid "Sync Plan"
@@ -6016,371 +5910,379 @@
 
 #: ../app/models/katello/trace_status.rb:20
 msgid "Unknown traces status"
 msgstr ""
 
-#: ../app/models/setting/content.rb:25
+#: ../app/models/setting/content.rb:24
 msgid "HTTP Proxies"
 msgstr ""
 
-#: ../app/models/setting/content.rb:33
+#: ../app/models/setting/content.rb:32
 msgid "Default HTTP Proxy for syncing content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:34
+#: ../app/models/setting/content.rb:33
 msgid "Default HTTP proxy"
 msgstr ""
 
-#: ../app/models/setting/content.rb:36
+#: ../app/models/setting/content.rb:35
 msgid "no global default"
 msgstr ""
 
-#: ../app/models/setting/content.rb:38
+#: ../app/models/setting/content.rb:37
 msgid "SSL version used to communicate with the CDN"
 msgstr ""
 
-#: ../app/models/setting/content.rb:39
+#: ../app/models/setting/content.rb:38
 msgid "CDN SSL version"
 msgstr ""
 
-#: ../app/models/setting/content.rb:41
+#: ../app/models/setting/content.rb:40
 msgid "Default provisioning template for Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:42
+#: ../app/models/setting/content.rb:41
 msgid "Default synced OS provisioning template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:46
+#: ../app/models/setting/content.rb:45
 msgid "Default finish template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:47
+#: ../app/models/setting/content.rb:46
 msgid "Default synced OS finish template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:50
+#: ../app/models/setting/content.rb:49
 msgid "Default user data for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:51
+#: ../app/models/setting/content.rb:50
 msgid "Default synced OS user-data"
 msgstr ""
 
-#: ../app/models/setting/content.rb:54
+#: ../app/models/setting/content.rb:53
 msgid "Default PXELinux template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:55
+#: ../app/models/setting/content.rb:54
 msgid "Default synced OS PXELinux template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:58
+#: ../app/models/setting/content.rb:57
 msgid "Default PXEGrub template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:59
+#: ../app/models/setting/content.rb:58
 msgid "Default synced OS PXEGrub template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:62
+#: ../app/models/setting/content.rb:61
 msgid "Default PXEGrub2 template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:63
+#: ../app/models/setting/content.rb:62
 msgid "Default synced OS PXEGrub2 template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:66
+#: ../app/models/setting/content.rb:65
 msgid "Default iPXE template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:67
+#: ../app/models/setting/content.rb:66
 msgid "Default synced OS iPXE template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:70
+#: ../app/models/setting/content.rb:69
 msgid "Default partitioning table for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:71
+#: ../app/models/setting/content.rb:70
 msgid "Default synced OS partition table"
 msgstr ""
 
-#: ../app/models/setting/content.rb:73
+#: ../app/models/setting/content.rb:72
 msgid "Default kexec template for new Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:73
+#: ../app/models/setting/content.rb:72
 msgid "Default synced OS kexec template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:76
+#: ../app/models/setting/content.rb:75
 msgid "Default provisioning template for new Atomic Operating Systems created from synced content"
 msgstr ""
 
-#: ../app/models/setting/content.rb:77
+#: ../app/models/setting/content.rb:76
 msgid "Default synced OS Atomic template"
 msgstr ""
 
-#: ../app/models/setting/content.rb:80
+#: ../app/models/setting/content.rb:79
 msgid "Timeout when refreshing a manifest (in seconds)"
 msgstr ""
 
-#: ../app/models/setting/content.rb:80
+#: ../app/models/setting/content.rb:79
 msgid "Manifest refresh timeout"
 msgstr ""
 
-#: ../app/models/setting/content.rb:81
+#: ../app/models/setting/content.rb:80
 msgid "Time in seconds to wait for a Host to pickup a remote action"
 msgstr ""
 
-#: ../app/models/setting/content.rb:82
+#: ../app/models/setting/content.rb:81
 msgid "Accept action timeout"
 msgstr ""
 
-#: ../app/models/setting/content.rb:83
+#: ../app/models/setting/content.rb:82
 msgid "Time in seconds to wait for a Host to finish a remote action"
 msgstr ""
 
-#: ../app/models/setting/content.rb:84
+#: ../app/models/setting/content.rb:83
 msgid "Finish action timeout"
 msgstr ""
 
-#: ../app/models/setting/content.rb:85
+#: ../app/models/setting/content.rb:84
 msgid "A server operating in disconnected mode does not communicate with the Red Hat CDN."
 msgstr ""
 
-#: ../app/models/setting/content.rb:86
+#: ../app/models/setting/content.rb:85
 msgid "Disconnected mode"
 msgstr ""
 
-#: ../app/models/setting/content.rb:87
+#: ../app/models/setting/content.rb:86
 msgid "Calculate errata host status based only on errata in a Host's Content View and Lifecycle Environment"
 msgstr ""
 
-#: ../app/models/setting/content.rb:88
+#: ../app/models/setting/content.rb:87
 msgid "Installable errata from Content View"
 msgstr ""
 
-#: ../app/models/setting/content.rb:89
+#: ../app/models/setting/content.rb:88
 msgid "If set to true, a composite content view may not be published or promoted, unless the component content view versions that it includes exist in the target environment."
 msgstr ""
 
-#: ../app/models/setting/content.rb:91
+#: ../app/models/setting/content.rb:90
 msgid "Restrict Composite Content View promotion"
 msgstr ""
 
-#: ../app/models/setting/content.rb:92
+#: ../app/models/setting/content.rb:91
 msgid "Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."
 msgstr ""
 
-#: ../app/models/setting/content.rb:93
+#: ../app/models/setting/content.rb:92
 msgid "Check services before actions"
 msgstr ""
 
-#: ../app/models/setting/content.rb:94
+#: ../app/models/setting/content.rb:93
 msgid "How many repositories should be synced concurrently on the capsule.  A smaller number may lead to longer sync times.  A larger number will increase dynflow load."
 msgstr ""
 
-#: ../app/models/setting/content.rb:95
+#: ../app/models/setting/content.rb:94
 msgid "Batch size to sync repositories in."
 msgstr ""
 
-#: ../app/models/setting/content.rb:96
+#: ../app/models/setting/content.rb:95
 msgid "Whether or not to auto sync the Smart Proxies after a Content View promotion."
 msgstr ""
 
-#: ../app/models/setting/content.rb:97
+#: ../app/models/setting/content.rb:96
 msgid "Sync Smart Proxies after Content View promotion"
 msgstr ""
 
-#: ../app/models/setting/content.rb:98
+#: ../app/models/setting/content.rb:97
 msgid "Default download policy for custom repositories (either 'immediate', 'on_demand', or 'background')"
 msgstr ""
 
-#: ../app/models/setting/content.rb:99
+#: ../app/models/setting/content.rb:98
 msgid "Default Custom Repository download policy"
 msgstr ""
 
-#: ../app/models/setting/content.rb:100
+#: ../app/models/setting/content.rb:99
 msgid "Default download policy for enabled Red Hat repositories (either 'immediate', 'on_demand', or 'background')"
 msgstr ""
 
-#: ../app/models/setting/content.rb:101
+#: ../app/models/setting/content.rb:100
 msgid "Default Red Hat Repository download policy"
 msgstr ""
 
-#: ../app/models/setting/content.rb:102
+#: ../app/models/setting/content.rb:101
 msgid "Default download policy for Smart Proxy syncs (either 'inherit', immediate', 'on_demand', or 'background')"
 msgstr ""
 
-#: ../app/models/setting/content.rb:103
+#: ../app/models/setting/content.rb:102
 msgid "Default Smart Proxy download policy"
 msgstr ""
 
-#: ../app/models/setting/content.rb:104
+#: ../app/models/setting/content.rb:103
 msgid "The port used by Pulp Crane to provide Docker Registries"
 msgstr ""
 
-#: ../app/models/setting/content.rb:105
+#: ../app/models/setting/content.rb:104
 msgid "Pulp Docker registry port"
 msgstr ""
 
-#: ../app/models/setting/content.rb:106
+#: ../app/models/setting/content.rb:105
 msgid "On-disk location for exported repositories"
 msgstr ""
 
-#: ../app/models/setting/content.rb:107
+#: ../app/models/setting/content.rb:106
 msgid "Pulp export destination filepath"
 msgstr ""
 
-#: ../app/models/setting/content.rb:108
+#: ../app/models/setting/content.rb:107
 msgid "On-disk location for pulp 3 exported repositories"
 msgstr ""
 
-#: ../app/models/setting/content.rb:109
+#: ../app/models/setting/content.rb:108
 msgid "Pulp 3 export destination filepath"
 msgstr ""
 
-#: ../app/models/setting/content.rb:110
+#: ../app/models/setting/content.rb:109
 msgid "Path for ssl key used for pulp server auth"
 msgstr ""
 
-#: ../app/models/setting/content.rb:111
+#: ../app/models/setting/content.rb:110
 msgid "Pulp client key"
 msgstr ""
 
-#: ../app/models/setting/content.rb:112
+#: ../app/models/setting/content.rb:111
 msgid "Path for ssl cert used for pulp server auth"
 msgstr ""
 
-#: ../app/models/setting/content.rb:113
+#: ../app/models/setting/content.rb:112
 msgid "Pulp client cert"
 msgstr ""
 
+#: ../app/models/setting/content.rb:113
+msgid "Total timeout in seconds for connections when syncing"
+msgstr ""
+
 #: ../app/models/setting/content.rb:114
-msgid "If set to true, use the remote execution over katello-agent for remote actions"
+msgid "Sync Connection Timeout"
 msgstr ""
 
 #: ../app/models/setting/content.rb:115
-msgid "Use remote execution by default"
+msgid "If set to true, use remote execution instead of katello-agent for remote actions"
 msgstr ""
 
 #: ../app/models/setting/content.rb:116
+msgid "Use remote execution by default"
+msgstr ""
+
+#: ../app/models/setting/content.rb:117
 msgid "When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host such as virtual machines and DNS records may also be deleted."
 msgstr ""
 
-#: ../app/models/setting/content.rb:118
+#: ../app/models/setting/content.rb:119
 msgid "Delete Host upon unregister"
 msgstr ""
 
-#: ../app/models/setting/content.rb:119
+#: ../app/models/setting/content.rb:120
 msgid "When registering a host via subscription-manager, force use the specified fact (in the form of 'fact.fact')"
 msgstr ""
 
-#: ../app/models/setting/content.rb:120
+#: ../app/models/setting/content.rb:121
 msgid "Subscription manager name registration fact"
 msgstr ""
 
-#: ../app/models/setting/content.rb:121
+#: ../app/models/setting/content.rb:122
 msgid "If true, and register_hostname_fact is set and provided, registration will look for a new host by name only using that fact, and will skip all hostname matching"
 msgstr ""
 
-#: ../app/models/setting/content.rb:122
+#: ../app/models/setting/content.rb:123
 msgid "Subscription manager name registration fact strict matching"
 msgstr ""
 
-#: ../app/models/setting/content.rb:124
+#: ../app/models/setting/content.rb:125
 msgid "Default Location where new subscribed hosts will put upon registration"
 msgstr ""
 
-#: ../app/models/setting/content.rb:125
+#: ../app/models/setting/content.rb:126
 msgid "Default Location subscribed hosts"
 msgstr ""
 
 #: ../app/models/setting/content.rb:128
-msgid "Default Location where new Puppet content will be put upon Content View publish"
-msgstr ""
-
-#: ../app/models/setting/content.rb:129
-msgid "Default Location Puppet content"
-msgstr ""
-
-#: ../app/models/setting/content.rb:131
 msgid "The number of days remaining in a subscription before you will be reminded about renewing it."
 msgstr ""
 
-#: ../app/models/setting/content.rb:132
+#: ../app/models/setting/content.rb:129
 msgid "Expire soon days"
 msgstr ""
 
-#: ../app/models/setting/content.rb:134
+#: ../app/models/setting/content.rb:131
 msgid "The default dependency solving value for new Content Views."
 msgstr ""
 
-#: ../app/models/setting/content.rb:135
+#: ../app/models/setting/content.rb:132
 msgid "Content View Dependency Solving Default"
 msgstr ""
 
-#: ../app/models/setting/content.rb:137
+#: ../app/models/setting/content.rb:134
 msgid "How the logic of solving dependencies in a Content View is managed. Conservative will only add packages to solve the dependencies if the package needed doesn't exist. Greedy will pull in the latest package to solve a dependency even if it already does exist in the repository."
 msgstr ""
 
-#: ../app/models/setting/content.rb:140
+#: ../app/models/setting/content.rb:137
 msgid "Content View Dependency Solving Algorithm"
 msgstr ""
 
-#: ../app/models/setting/content.rb:143
+#: ../app/models/setting/content.rb:140
 msgid "If hosts fail to register because of duplicate DMI UUIDs add their comma-separated values here. Subsequent registrations will generate a unique DMI UUID for the affected hosts."
 msgstr ""
 
-#: ../app/models/setting/content.rb:145
+#: ../app/models/setting/content.rb:142
 msgid "Host Duplicate DMI UUIDs"
 msgstr ""
 
-#: ../app/models/setting/content.rb:146
+#: ../app/models/setting/content.rb:143
 msgid "Allow new Host registrations to assume registered profiles with matching hostname as long as the registering DMI UUID is not used by another host."
 msgstr ""
 
-#: ../app/models/setting/content.rb:148
+#: ../app/models/setting/content.rb:145
 msgid "Host Profile Assume"
 msgstr ""
 
-#: ../app/models/setting/content.rb:149
+#: ../app/models/setting/content.rb:146
 msgid "Amount of workers in the pool to handle the execution of host-related tasks. When set to 0, the default queue will be used instead. Restart of the dynflowd/foreman-tasks service is required."
 msgstr ""
 
-#: ../app/models/setting/content.rb:150
+#: ../app/models/setting/content.rb:147
 msgid "Host Tasks Workers Pool Size"
 msgstr ""
 
-#: ../app/models/setting/content.rb:151
+#: ../app/models/setting/content.rb:148
 msgid "Number of host applicability calculations to process per task."
 msgstr ""
 
-#: ../app/models/setting/content.rb:152
+#: ../app/models/setting/content.rb:149
 msgid "Applicability Batch Size"
 msgstr ""
 
-#: ../app/models/setting/content.rb:153
+#: ../app/models/setting/content.rb:150
 msgid "For pages that support it, automatically perform search while typing in search input."
 msgstr ""
 
-#: ../app/models/setting/content.rb:154
+#: ../app/models/setting/content.rb:151
 msgid "Autosearch"
 msgstr ""
 
-#: ../app/models/setting/content.rb:155
+#: ../app/models/setting/content.rb:152
 msgid "If Autosearch is enabled, delay in milliseconds before executing searches while typing."
 msgstr ""
 
-#: ../app/models/setting/content.rb:156
+#: ../app/models/setting/content.rb:153
 msgid "Autosearch delay"
 msgstr ""
 
-#: ../app/models/setting/content.rb:186
+#: ../app/models/setting/content.rb:154
+msgid "The number of items fetched from a single paged Pulp API call."
+msgstr ""
+
+#: ../app/models/setting/content.rb:155
+msgid "Pulp bulk load size"
+msgstr ""
+
+#: ../app/models/setting/content.rb:185
 msgid "There is no such HTTP proxy"
 msgstr ""
 
 #: ../app/presenters/katello/sync_status_presenter.rb:6
 msgid "Syncing Complete."
@@ -6444,60 +6346,58 @@
 
 #: ../app/services/katello/pulp/erratum.rb:117
 msgid "Failed indexing errata, maximum retries encountered"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/export.rb:101
+#: ../app/services/katello/pulp3/content_view_version/export.rb:102
 msgid ""
 "NOTE: Unable to fully export Content View Version '%{content_view} %{current}' it contains repositories without the 'immediate' download policy. Update the download policy and sync affected repositories. Once synced republish the content view and export the generated version. \n"
 " %{repos}"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/export.rb:122
+#: ../app/services/katello/pulp3/content_view_version/export.rb:123
 msgid "The exported Content View Version '%{content_view} %{current}' cannot be incrementally updated from version '%{from}'. Please do a full export."
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/export.rb:177
+#: ../app/services/katello/pulp3/content_view_version/export.rb:155
 msgid "Product: '%{product}', Repository: '%{repository}'"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:25
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:39
 msgid "Content View Version specified in the metadata - '%{name}' already exists. If you wish to replace the existing version, delete %{name} and try again. "
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:39
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:53
 msgid "Prior Content View Version specified in the metadata - '%{name}' does not exist. Please import the metadata for '%{name}' before importing '%{current}' "
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:65
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:81
 msgid ""
-"The following repositories provided in the import metadata are either not available in the Library or are of incorrect Respository Type. Please add or enable the repositories before importing\n"
+"The following repositories provided in the import metadata have an incorrect content type or provider type. Make sure the export and import repositories are of the same type before importing\n"
 " %{repos}"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:75
-msgid "Red Hat"
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:100
+msgid ""
+"The following repositories provided in the import metadata are either not available in the Library or are of incorrect Respository Type. Please add or enable the repositories before importing\n"
+" %{repos}"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:75
-msgid "Custom"
-msgstr ""
-
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:76
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:110
 msgid ""
 "\n"
-"* Product = '%{product}', Repository = '%{repository}', Repository Type = '%{repo_type}'"
+"* Product = '%{product}', Repository = '%{repository}'"
 msgstr ""
 
+#: ../app/services/katello/pulp3/content_view_version/importable_repositories.rb:33
+msgid "Unable to find product '%s' in organization '%s'"
+msgstr ""
+
 #: ../app/services/katello/pulp3/deb.rb:16 ../app/services/katello/pulp3/file_unit.rb:12
 msgid "Artifact Id and relative path are needed to create content"
 msgstr ""
 
-#: ../app/services/katello/pulp3/migration.rb:30
-msgid "Pulp 3 migration cannot run. Types %s have already been migrated."
-msgstr ""
-
 #: ../app/services/katello/registration_manager.rb:146
 msgid "Content View and Environment not set for registration."
 msgstr ""
 
 #: ../app/services/katello/registration_manager.rb:239
@@ -6538,11 +6438,11 @@
 
 #: ../app/views/dashboard/_content_views_widget.html.erb:16
 msgid "Task"
 msgstr ""
 
-#: ../app/views/dashboard/_content_views_widget.html.erb:17 ../app/views/dashboard/_sync_widget.html.erb:18 ../webpack/components/extensions/about/SystemStatuses.js:24 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:59 ../webpack/scenes/Subscriptions/Manifest/ManifestHistoryTableSchema.js:8
+#: ../app/views/dashboard/_content_views_widget.html.erb:17 ../app/views/dashboard/_sync_widget.html.erb:18 ../webpack/components/extensions/about/SystemStatuses.js:24 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:40 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:38 ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:40 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:73 ../webpack/scenes/Subscriptions/Manifest/ManifestHistoryTableSchema.js:8
 msgid "Status"
 msgstr ""
 
 #: ../app/views/dashboard/_errata_widget.html.erb:2
 msgid "Latest Errata"
@@ -6550,11 +6450,11 @@
 
 #: ../app/views/dashboard/_errata_widget.html.erb:10
 msgid "There are no errata that need to be applied to registered content hosts."
 msgstr ""
 
-#: ../app/views/dashboard/_errata_widget.html.erb:15 ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:20 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:7 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:60 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:54 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:19 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:35 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:15 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:90 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:63
+#: ../app/views/dashboard/_errata_widget.html.erb:15 ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:20 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:7 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:35 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:60 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:68 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:14 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:35 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:15 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:90 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:64
 msgid "Type"
 msgstr ""
 
 #: ../app/views/dashboard/_errata_widget.html.erb:27
 msgid "%s Host"
@@ -6568,15 +6468,15 @@
 
 #: ../app/views/dashboard/_host_collection_widget.html.erb:15
 msgid "Updates"
 msgstr ""
 
-#: ../app/views/dashboard/_host_collection_widget.html.erb:16 ../webpack/components/Content/Details/ContentDetailRepositoryTableSchema.js:13 ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:14 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:7 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:44 ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:48 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:55 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:20 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:9 ../webpack/scenes/ModuleStreams/Details/Profiles/TableSchema.js:13 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:15 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:4 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:60 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:52
+#: ../app/views/dashboard/_host_collection_widget.html.erb:16 ../webpack/components/Content/Details/ContentDetailRepositoryTableSchema.js:13 ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:14 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:7 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:36 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:44 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:34 ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:34 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:69 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:15 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:9 ../webpack/scenes/ModuleStreams/Details/Profiles/TableSchema.js:13 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:15 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:4 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:60 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:53
 msgid "Name"
 msgstr ""
 
-#: ../app/views/dashboard/_host_collection_widget.html.erb:17 ../lib/katello/plugin.rb:192 ../webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js:22
+#: ../app/views/dashboard/_host_collection_widget.html.erb:17 ../lib/katello/plugin.rb:181 ../webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js:22
 msgid "Content Hosts"
 msgstr ""
 
 #: ../app/views/dashboard/_subscription_status_widget.html.erb:2 ../app/views/dashboard/_subscription_status_widget.html.erb:16
 msgid "Subscription Status"
@@ -6636,27 +6536,19 @@
 
 #: ../app/views/dashboard/_sync_widget.html.erb:12
 msgid "No recently synced products"
 msgstr ""
 
-#: ../app/views/dashboard/_sync_widget.html.erb:17 ../app/views/katello/sync_management/_products.html.erb:7 ../webpack/components/Content/Details/ContentDetailRepositoryTableSchema.js:31 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:56
+#: ../app/views/dashboard/_sync_widget.html.erb:17 ../app/views/katello/sync_management/_products.html.erb:7 ../webpack/components/Content/Details/ContentDetailRepositoryTableSchema.js:31 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:35 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:70
 msgid "Product"
 msgstr ""
 
 #: ../app/views/dashboard/_sync_widget.html.erb:19
 msgid "Finished"
 msgstr ""
 
-#: ../app/views/foreman/hosts/_registration.html.erb:3
-msgid "Activation Key(s)"
-msgstr ""
-
-#: ../app/views/foreman/hosts/_registration.html.erb:4
-msgid "Activation key(s) for Subscription Manager. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3."
-msgstr ""
-
-#: ../app/views/foreman/smart_proxies/_content_sync.html.erb:2 ../lib/katello/plugin.rb:269
+#: ../app/views/foreman/smart_proxies/_content_sync.html.erb:2 ../lib/katello/plugin.rb:259
 msgid "Content Sync"
 msgstr ""
 
 #: ../app/views/katello/errata_mailer/_erratum.html.erb:4
 msgid "Errata ID"
@@ -6752,11 +6644,11 @@
 
 #: ../app/views/katello/errata_mailer/sync_errata.text.erb:1
 msgid "Sync Summary"
 msgstr ""
 
-#: ../app/views/katello/errata_mailer/sync_errata.text.erb:8
+#: ../app/views/katello/errata_mailer/sync_errata.text.erb:8 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:36
 msgid "Repository"
 msgstr ""
 
 #: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:14
 msgid "SUBSCRIPTIONS EXPIRING SOON"
@@ -6772,23 +6664,23 @@
 
 #: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:21 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:8 ../webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js:17
 msgid "Quantity"
 msgstr ""
 
-#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:22 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:9 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:65 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:73
+#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:22 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:9 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:65 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:74
 msgid "SKU"
 msgstr ""
 
-#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:23 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:10 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:70 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:31 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:83
+#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:23 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:10 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:70 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:31 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:84
 msgid "Contract"
 msgstr ""
 
-#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:24 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:11 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:75 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:42 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:93
+#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:24 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:11 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:75 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:42 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:94
 msgid "Start Date"
 msgstr ""
 
-#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:25 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:12 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:80 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:52 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:103
+#: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:25 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:12 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:80 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:52 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:104
 msgid "End Date"
 msgstr ""
 
 #: ../app/views/katello/subscription_mailer/subscription_expiry.html.erb:26 ../app/views/katello/subscription_mailer/subscription_expiry.text.erb:13
 msgid "Days Remaining"
@@ -6824,11 +6716,11 @@
 
 #: ../app/views/katello/sync_management/_products.html.erb:13
 msgid "Duration"
 msgstr ""
 
-#: ../app/views/katello/sync_management/_products.html.erb:16 ../db/seeds.d/109-katello-notification-blueprints.rb:12 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:21 ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:22 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:20 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:33 ../webpack/scenes/ContentViews/expansions/DetailsExpansion.js:5 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:25 ../webpack/scenes/Subscriptions/Details/SubscriptionDetails.js:86
+#: ../app/views/katello/sync_management/_products.html.erb:16 ../db/seeds.d/109-katello-notification-blueprints.rb:12 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:21 ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:28 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:25 ../webpack/scenes/Subscriptions/Details/SubscriptionDetails.js:86
 msgid "Details"
 msgstr ""
 
 #: ../app/views/katello/sync_management/_products.html.erb:19
 msgid "Result"
@@ -6880,10 +6772,14 @@
 
 #: ../app/views/overrides/activation_keys/_host_environment_select.html.erb:38
 msgid "Content Source"
 msgstr ""
 
+#: ../app/views/overrides/activation_keys/_host_media_type_select.html.erb:12
+msgid "Media Selection"
+msgstr ""
+
 #: ../app/views/overrides/activation_keys/_host_media_type_select.html.erb:15 ../app/views/overrides/activation_keys/_host_synced_content_select.html.erb:12
 msgid "Synced Content"
 msgstr ""
 
 #: ../app/views/overrides/activation_keys/_host_media_type_select.html.erb:18
@@ -7106,10 +7002,22 @@
 
 #: ../db/seeds.d/109-katello-notification-blueprints.rb:85
 msgid "Disabling Simple Content Access failed for '%{subject}'."
 msgstr ""
 
+#: ../db/seeds.d/109-katello-notification-blueprints.rb:89
+msgid "System Status"
+msgstr ""
+
+#: ../db/seeds.d/109-katello-notification-blueprints.rb:91
+msgid "Some services are not properly started. See the About page for more information."
+msgstr ""
+
+#: ../db/seeds.d/109-katello-notification-blueprints.rb:96
+msgid "About page"
+msgstr ""
+
 #: ../db/seeds.d/110-content-view-autopublish.rb:6
 msgid "Composite Content View '%{subject}' failed auto-publish"
 msgstr ""
 
 #: ../lib/katello/plugin.rb:30
@@ -7142,106 +7050,114 @@
 
 #: ../lib/katello/plugin.rb:170 ../webpack/containers/Application/config.js:49 ../webpack/scenes/AnsibleCollections/AnsibleCollectionsPage.js:51
 msgid "Ansible Collections"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:181
-msgid "Puppet Modules"
-msgstr ""
-
-#: ../lib/katello/plugin.rb:289
-msgid "Katello"
-msgstr ""
-
-#: ../lib/katello/plugin.rb:294
+#: ../lib/katello/plugin.rb:282
 msgid "Storage"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:323
+#: ../lib/katello/plugin.rb:311
 msgid "Katello: Install Package"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:323
+#: ../lib/katello/plugin.rb:311
 msgid "Install package via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:324
+#: ../lib/katello/plugin.rb:312
 msgid "Katello: Update Package"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:324
+#: ../lib/katello/plugin.rb:312
 msgid "Update package via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:325
+#: ../lib/katello/plugin.rb:313
 msgid "Katello: Remove Package"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:325
+#: ../lib/katello/plugin.rb:313
 msgid "Remove package via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:326
+#: ../lib/katello/plugin.rb:314
 msgid "Katello: Install Package Group"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:326
+#: ../lib/katello/plugin.rb:314
 msgid "Install package group via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:327
+#: ../lib/katello/plugin.rb:315
 msgid "Katello: Update Package Group"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:327
+#: ../lib/katello/plugin.rb:315
 msgid "Update package group via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:328
+#: ../lib/katello/plugin.rb:316
 msgid "Katello: Remove Package Group"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:328
+#: ../lib/katello/plugin.rb:316
 msgid "Remove package group via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:329
+#: ../lib/katello/plugin.rb:317
 msgid "Katello: Install Errata"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:329
+#: ../lib/katello/plugin.rb:317
 msgid "Install errata via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:330
+#: ../lib/katello/plugin.rb:318
 msgid "Katello: Service Restart"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:330
+#: ../lib/katello/plugin.rb:318
 msgid "Restart Services via Katello interface"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:331
+#: ../lib/katello/plugin.rb:319
 msgid "Katello: Module Stream Actions"
 msgstr ""
 
-#: ../lib/katello/plugin.rb:332
+#: ../lib/katello/plugin.rb:320
 msgid "Perform a module stream action via Katello interface"
 msgstr ""
 
-#: ../lib/proxy_api/container_gateway.rb:18
-msgid "Unable to perform unauthenticated repository list operation"
+#: ../lib/proxy_api/container_gateway.rb:13
+msgid "Unable to update the repository list"
 msgstr ""
 
+#: ../lib/proxy_api/container_gateway.rb:21
+msgid "Unable to update the user-repository mapping"
+msgstr ""
+
+#: ../lib/proxy_api/container_gateway.rb:29
+msgid "Unable to get users"
+msgstr ""
+
 #: ../lib/proxy_api/pulp.rb:12 ../lib/proxy_api/pulp_node.rb:12
 msgid "Unable to detect pulp storage"
 msgstr ""
 
 #: ../lib/proxy_api/pulp.rb:19 ../lib/proxy_api/pulp_node.rb:19
 msgid "Unable to detect puppet path"
 msgstr ""
 
+#: ../webpack/components/AddedStatusLabel.js:10
+msgid "Added"
+msgstr ""
+
+#: ../webpack/components/AddedStatusLabel.js:14
+msgid "Not added"
+msgstr ""
+
 #: ../webpack/components/Content/ContentTable.js:14
 msgid "No Content found"
 msgstr ""
 
 #: ../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
@@ -7282,10 +7198,50 @@
 
 #: ../webpack/components/WithOrganization/withOrganization.js:54
 msgid "Select Organization"
 msgstr ""
 
+#: ../webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js:50
+msgid "No Activation Keys selected"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js:52
+msgid "Activation key(s) for Subscription Manager."
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js:65
+msgid "No Activation keys to select"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js:71
+msgid "No environment"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/Force.js:14
+msgid "Force"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/Force.js:15
+msgid "Remove any `katello-ca-consumer` rpms before registration and run subscription-manager with `--force` argument."
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js:14
+msgid "Ignore errors"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js:15
+msgid "Ignore subscription manager errors"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js:17
+msgid "Lifecycle environment"
+msgstr ""
+
+#: ../webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js:30
+msgid "No Lifecycle environment to select"
+msgstr ""
+
 #: ../webpack/components/extensions/about/SystemStatuses.js:18
 msgid "Backend System Status"
 msgstr ""
 
 #: ../webpack/components/extensions/about/SystemStatuses.js:23
@@ -7298,19 +7254,15 @@
 
 #: ../webpack/components/pf3Table/components/TableSelectionCell.js:37
 msgid "Select row"
 msgstr ""
 
-#: ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:12
-msgid "NA"
-msgstr ""
-
-#: ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:16 ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:51 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:69
+#: ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:50 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js:69 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js:117
 msgid "Unlimited"
 msgstr ""
 
-#: ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:52
+#: ../webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js:51
 msgid "Max %(maxQuantity)s"
 msgstr ""
 
 #: ../webpack/components/react-bootstrap-select/index.js:62
 msgid "{0} items selected"
@@ -7346,27 +7298,27 @@
 
 #: ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:30 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:9
 msgid "Author"
 msgstr ""
 
-#: ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:40 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:10 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:13 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:41
+#: ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:40 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:10 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:37 ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:39 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:32 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:13 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:41
 msgid "Version"
 msgstr ""
 
 #: ../webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js:50 ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:11
 msgid "Checksum"
 msgstr ""
 
-#: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:8 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:70 ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:49 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:11 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:5
+#: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:8 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:41 ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:70 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:37 ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:35 ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:42 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:37 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:11 ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:5
 msgid "Description"
 msgstr ""
 
 #: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:12
 msgid "Tags"
 msgstr ""
 
-#: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:28 ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:30 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:32 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:43
+#: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:28 ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:39 ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:42 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:32 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:43
 msgid "Repositories"
 msgstr ""
 
 #: ../webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js:31 ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:35
 msgid "No repositories to show"
@@ -7394,31 +7346,83 @@
 
 #: ../webpack/scenes/ContentViews/Create/ContentViewFormComponents.js:53
 msgid "Import Only"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:32
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js:19
+msgid "Latest (automatically updates)"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js:20 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:15
+msgid "Latest version"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js:20
+msgid "New version is available: Version ${latestVersion}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:38 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:33
+msgid "Environments"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:73
+msgid "No content views belong to ${label}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:74
+msgid "Please add some content views."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:75 ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:111
+msgid "No matching content views found"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js:76 ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:80 ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:74 ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:81 ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:110 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:199 ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:79 ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:112
+msgid "Try changing your search settings."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:36
 msgid " Content view updated."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:71
-msgid "Something went wrong while retrieving the repository types! ${error}"
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:75
+msgid "Something went wrong while retrieving the repository types! ${getResponseErrorMsgs(error.response)}"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:78
-msgid "Something went wrong while retrieving the content view filters! ${error}"
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:82
+msgid "Something went wrong while retrieving the content view filters! ${getResponseErrorMsgs(error.response)}"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:26 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:22 ../webpack/scenes/ContentViews/expansions/VersionsExpansion.js:5
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:89 ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:98
+msgid "Something went wrong while retrieving the content view filter! ${getResponseErrorMsgs(error.response)}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:108
+msgid "Something went wrong while retrieving the content view history! ${getResponseErrorMsgs(error.response)}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:116
+msgid "Something went wrong while retrieving the content view filter rules! ${getResponseErrorMsgs(error.response)}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:126
+msgid "Something went wrong while retrieving the content view components! ${getResponseErrorMsgs(error.response)}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetailActions.js:137
+msgid "Something went wrong while retrieving the content view versions! ${getResponseErrorMsgs(error.response)}"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:33 ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:30
 msgid "Versions"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:34
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:48
 msgid "Filters"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:38
+#: ../webpack/scenes/ContentViews/Details/ContentViewDetails.js:54
 msgid "History"
 msgstr ""
 
 #: ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:50
 msgid "Label"
@@ -7430,10 +7434,58 @@
 
 #: ../webpack/scenes/ContentViews/Details/ContentViewInfo.js:85
 msgid "Solve dependencies"
 msgstr ""
 
+#: ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:77
+msgid "No package groups have been added to this filter."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:78
+msgid "Add to this filter using the 'Add package group' button."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:79
+msgid "No matching package groups found."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js:84
+msgid "Package groups"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:28
+msgid "RPM name"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:29
+msgid "Architecture"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:71
+msgid "No rules have been added to this filter."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:72
+msgid "Add to this filter using the 'Add RPM' button."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:73
+msgid "No matching rules found."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:75
+msgid "Included"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:75
+msgid "Excluded"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js:75
+msgid " RPMs"
+msgstr ""
+
 #: ../webpack/scenes/ContentViews/Details/Filters/ContentType.js:11 ../webpack/scenes/RedHatRepositories/components/SearchBar.js:21
 msgid "RPM"
 msgstr ""
 
 #: ../webpack/scenes/ContentViews/Details/Filters/ContentType.js:12
@@ -7442,74 +7494,138 @@
 
 #: ../webpack/scenes/ContentViews/Details/Filters/ContentType.js:13
 msgid "Module stream"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:50
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js:26
+msgid "Include"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js:26
+msgid "Exclude"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:36
 msgid "Updated"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:51
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:37
 msgid "Content type"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:52
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:38
 msgid "Inclusion type"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:92
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:78
 msgid "You currently don't have any filters for this content view."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:93
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:79
 msgid "Add filters using the 'Add filter' button above."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:94
+#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:80
 msgid "No matching filters found"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js:95 ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:132 ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:118
-msgid "Try changing your search settings."
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:38
+msgid "Date"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:57
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:41
+msgid "Action"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:43
+msgid "User"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:107
+msgid "You currently don't have any history for this content view."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:108
+msgid "History will appear here when the content view is published or promoted."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js:109
+msgid "No matching history record found"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:71
 msgid "Sync state"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:129
+#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:196
 msgid "You currently don't have any repositories to add to this content view."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:130
+#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:197
 msgid "Please add some repositories."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:131
+#: ../webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js:198
 msgid "No matching repositories found"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:115
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js:41
+msgid "N/A"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersionEnvironments.js:10
+msgid "No environments"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:36
+msgid "Additional content"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:60 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:64
+msgid "No description"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:76
+msgid "You currently don't have any versions for this content view."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:77
+msgid "Versions will appear here when the content view is published."
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js:78
+msgid "No matching version found"
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:109
 msgid "You currently don't have any Content Views."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:116
+#: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:110
 msgid "A content view can be added by using the \"New content view\" button below."
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Table/ContentViewsTable.js:117
-msgid "No matching content views found"
+#: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:15 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:39
+msgid "Last published"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:20 ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:39
-msgid "Last published"
+#: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:15
+msgid "Last task"
 msgstr ""
 
-#: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:21 ../webpack/scenes/ContentViews/expansions/EnvironmentsExpansion.js:9
-msgid "Environments"
+#: ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:29 ../webpack/scenes/ContentViews/Table/tableDataGenerator.js:35
+msgid "Not yet published"
 msgstr ""
 
+#: ../webpack/scenes/ContentViews/expansions/DetailsExpansion.js:11
+msgid "Activation keys: "
+msgstr ""
+
+#: ../webpack/scenes/ContentViews/expansions/DetailsExpansion.js:13
+msgid "Hosts: "
+msgstr ""
+
 #: ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:12 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:31
 msgid "Stream"
 msgstr ""
 
 #: ../webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js:14 ../webpack/scenes/ModuleStreams/ModuleStreamsTableSchema.js:61
@@ -7642,15 +7758,15 @@
 
 #: ../webpack/scenes/SmartProxy/SmartProxyContentTable.js:47
 msgid "Synced to smart proxy"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:6 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:85 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:113
+#: ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:6 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:85 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:114
 msgid "Requires Virt-Who"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:7 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:95 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:129
+#: ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:7 ../webpack/scenes/Subscriptions/SubscriptionConstants.js:95 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:130
 msgid "Consumed"
 msgstr ""
 
 #: ../webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js:8
 msgid "Starts"
@@ -7766,10 +7882,14 @@
 
 #: ../webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js:5
 msgid "Usage Type"
 msgstr ""
 
+#: ../webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js:6
+msgid "Roles"
+msgstr ""
+
 #: ../webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js:7
 msgid "Add ons"
 msgstr ""
 
 #: ../webpack/scenes/Subscriptions/Manifest/DeleteManifestModalText.js:4
@@ -7866,11 +7986,11 @@
 
 #: ../webpack/scenes/Subscriptions/Manifest/SimpleContentAccess.js:51
 msgid "When Simple Content Access is enabled, hosts are not required to have subscriptions attached to access repositories."
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/SubscriptionConstants.js:100 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:139
+#: ../webpack/scenes/Subscriptions/SubscriptionConstants.js:100 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:140
 msgid "Entitlements"
 msgstr ""
 
 #: ../webpack/scenes/Subscriptions/SubscriptionValidations.js:11
 msgid "Not a number"
@@ -7982,11 +8102,15 @@
 
 #: ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionTypeFormatter.js:22
 msgid "Virtual"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:31
+#: ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js:113
+msgid "NA"
+msgstr ""
+
+#: ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js:32
 msgid "Select all rows"
 msgstr ""
 
 #: ../webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js:88
 msgid "Yay empty state"
@@ -8051,115 +8175,115 @@
 #: ../webpack/utils/helpers.js:9
 msgid "The subscription is no longer available"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Sync capsule"
+msgid "Instance update"
 msgstr ""
 
+#: action_names.rb:5
+msgid "Index package groups"
+msgstr ""
+
 #: action_names.rb:6
-msgid "Errata mail"
+msgid "Index module streams"
 msgstr ""
 
 #: action_names.rb:7
-msgid "Incremental Update of  Content View Version(s) "
+msgid "Index errata"
 msgstr ""
 
-#: action_names.rb:16
-msgid "Promote"
+#: action_names.rb:8
+msgid "Index content"
 msgstr ""
 
-#: action_names.rb:21
-msgid "Auto attach subscriptions"
+#: action_names.rb:10
+msgid "Filtered index content"
 msgstr ""
 
-#: action_names.rb:26
-msgid "Hypervisors"
+#: action_names.rb:11
+msgid "Fetch pxe files"
 msgstr ""
 
-#: action_names.rb:27
-msgid "Hypervisors update"
+#: action_names.rb:13
+msgid "Errata mail"
 msgstr ""
 
-#: action_names.rb:38
-msgid "Reindex subscriptions"
+#: action_names.rb:14
+msgid "Discover"
 msgstr ""
 
-#: action_names.rb:39
+#: action_names.rb:19
 msgid "Update http proxy"
 msgstr ""
 
-#: action_names.rb:41
-msgid "Discover"
+#: action_names.rb:20
+msgid "Reindex subscriptions"
 msgstr ""
 
-#: action_names.rb:42
-msgid "Fetch pxe files"
+#: action_names.rb:31
+msgid "Hypervisors update"
 msgstr ""
 
-#: action_names.rb:44
-msgid "Filtered index content"
+#: action_names.rb:32
+msgid "Hypervisors"
 msgstr ""
 
-#: action_names.rb:45
-msgid "Index content"
+#: action_names.rb:35
+msgid "Auto attach subscriptions"
 msgstr ""
 
-#: action_names.rb:46
-msgid "Index errata"
-msgstr ""
-
-#: action_names.rb:47
-msgid "Index module streams"
-msgstr ""
-
 #: action_names.rb:48
-msgid "Index package groups"
+msgid "Promote"
 msgstr ""
 
 #: action_names.rb:49
-msgid "Instance update"
+msgid "Remote action:"
 msgstr ""
 
-#: action_names.rb:52
-msgid "Update content urls"
+#: action_names.rb:50
+msgid "Incremental Update of  Content View Version(s) "
 msgstr ""
 
-#: action_names.rb:53
-msgid "Update http proxy details"
+#: action_names.rb:51
+msgid "Sync capsule"
 msgstr ""
 
-#: action_names.rb:54
-msgid "Update redhat repository"
+#: action_names.rb:56
+msgid "Agent action"
 msgstr ""
 
-#: action_names.rb:57
-msgid "Verify checksum"
+#: action_names.rb:58
+msgid "Abstract async task"
 msgstr ""
 
-#: action_names.rb:62
-msgid "Copy version units to library"
+#: action_names.rb:59
+msgid "Import Puppet classes"
 msgstr ""
 
-#: action_names.rb:65
-msgid "Remote action:"
+#: action_names.rb:60
+msgid "Import facts"
 msgstr ""
 
-#: action_names.rb:66
-msgid "Import Puppet classes"
-msgstr ""
-
-#: action_names.rb:67
+#: action_names.rb:61
 msgid "Action with sub plans"
 msgstr ""
 
-#: action_names.rb:68
-msgid "Abstract async task"
+#: action_names.rb:64
+msgid "Copy version units to library"
 msgstr ""
 
 #: action_names.rb:70
-msgid "Agent action"
+msgid "Verify checksum"
 msgstr ""
 
-#: action_names.rb:72
-msgid "Import facts"
+#: action_names.rb:73
+msgid "Update redhat repository"
+msgstr ""
+
+#: action_names.rb:74
+msgid "Update http proxy details"
+msgstr ""
+
+#: action_names.rb:75
+msgid "Update content urls"
 msgstr ""