katello 4.1.0.rc2.2 → 4.1.0

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages.html

@@ -1,9 +1,9 @@
 <form role="form" id="packageActionForm" method="post" action="/katello/remote_execution">
   <input type="hidden" name="name" ng-value="packageActionFormValues.package"/>
   <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
-  <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
+  <input type="hidden" name="bulk_host_ids" ng-value="packageActionFormValues.bulkHostIds"/>
   <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
   <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
 </form>
 
-<div ui-view></div>
+<div ui-view></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -2525,7 +2525,7 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
-msgid "Ignorable Content"
+msgid "Ignore SRPMs"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js
@@ -4591,10 +4591,6 @@ msgstr ""
 msgid "Select an Organization"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
-msgid "Select content units to ignore while synchronizing this repository."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-repositories.html
 #: app/assets/javascripts/bastion_katello/environments/details/environment-content.controller.js
 msgid "Select Content View"
@@ -4612,6 +4608,10 @@ msgstr ""
 msgid "Selecting \"Complete Sync\" will cause only Yum repositories of the selected product to be synced. Selecting \"Validate Content\" will cause only Yum repositories using the \"Immediate\" download policy to be synced."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Selecting this option will exclude SRPMs from repository synchronization."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "Selecting this option will result in contents that are no longer part of the upstream repository being removed during synchronization."
 msgstr ""
@@ -5604,11 +5604,6 @@ msgstr ""
 msgid "Usage Type:"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
-#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
-msgid "Use Ctrl-click to multi-select/deselect items."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/http-proxy-service.js
 msgid "Use specific HTTP Proxy"
 msgstr ""

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -144,13 +144,11 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.collectionURLPopover = $sce.trustAsHtml("You can sync collections utilizing just the url:<br/>" +
           "<b>1. For all collections in Ansible Galaxy:</b><br/>" +
-          "https://galaxy.ansible.com/api/v2/collections <br/>" +
-          "<b>2. For specific collection with URL filtering:</b><br/>" +
-          "https://galaxy.ansible.com/api/v2/collections/testing/k8s_demo_collection <br/>" +
-          "<b>3. For specific collections with Requirements.yml:</b><br/>" +
+          "https://galaxy.ansible.com/api/<br/>" +
+          "<b>2. For specific collections with Requirements.yml:</b><br/>" +
           "Use base URL https://galaxy.ansible.com/ and specify requirements.yml below to specify collections");
 
-            $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
+            $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/latest/galaxy/user_guide.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
 
             $scope.displayHttpProxyPolicyName = function (policy) {
                 return HttpProxyPolicy.displayHttpProxyPolicyName(policy);

data/lib/katello.rb

@@ -28,6 +28,6 @@ module Katello
   require "katello/engine"
 
   def self.pulp_server
-    Katello::Pulp::Server.config(SETTINGS[:katello][:pulp][:url], User.remote_user)
+    Katello::Pulp::Server.config(::SmartProxy.pulp_primary.url + '/pulp/api/v2/', User.remote_user)
   end
 end

data/lib/katello/engine.rb

@@ -37,7 +37,6 @@ module Katello
         },
         :pulp => {
           :default_login => 'admin',
-          :url => 'https://localhost/pulp/api/v2/',
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
@@ -233,7 +232,6 @@ module Katello
       load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
 
-      Katello::EventQueue.register_event(Katello::Events::ImportHostApplicability::EVENT_TYPE, Katello::Events::ImportHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
       Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
       Katello::EventQueue.register_event(Katello::Events::GenerateHostApplicability::EVENT_TYPE, Katello::Events::GenerateHostApplicability)

data/lib/katello/permission_creator.rb

@@ -78,7 +78,7 @@ module Katello
                    'katello/api/v2/content_view_components' => [:index, :show],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
-                   'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
+                   'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
@@ -143,14 +143,6 @@ module Katello
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :promotable_or_removable
-      @plugin.permission :export_content_views,
-                         {
-                           'katello/api/v2/content_view_versions' => [:export],
-                           'katello/api/v2/content_exports' => [:version, :index],
-                           'katello/api/v2/content_export_incrementals' => [:version]
-                         },
-                         :resource_type => 'Katello::ContentView',
-                         :finder_scope => :exportable
     end
 
     def content_credential_permissions
@@ -409,16 +401,17 @@ module Katello
     end
 
     def organization_permissions
-      @plugin.permission :import_library_content,
+      @plugin.permission :import_content,
                          {
-                           'katello/api/v2/content_imports' => [:library, :index]
+                           'katello/api/v2/content_imports' => [:library, :version, :index]
                          },
                          :resource_type => 'Organization'
 
-      @plugin.permission :export_library_content,
+      @plugin.permission :export_content,
                          {
-                           'katello/api/v2/content_exports' => [:library, :index],
-                           'katello/api/v2/content_export_incrementals' => [:library]
+                           'katello/api/v2/content_view_versions' => [:export],
+                           'katello/api/v2/content_exports' => [:library, :version, :index],
+                           'katello/api/v2/content_export_incrementals' => [:library, :version]
                          },
                          :resource_type => 'Organization'
     end

data/lib/katello/plugin.rb

@@ -359,6 +359,15 @@ Foreman::Plugin.register :katello do
     :view_operatingsystems, :view_smart_proxies
   ]
 
+  role 'Content Importer', [
+    :import_content, :create_products, :create_content_views,
+    :edit_products, :edit_content_views, :view_organizations
+  ], 'Role granting permission to import content views in an organization'
+
+  role 'Content Exporter', [
+    :export_content, :view_products, :view_content_views, :view_organizations
+  ], 'Role granting permission to export content views in an organization'
+
   def find_katello_assets(args = {})
     type = args.fetch(:type, nil)
     vendor = args.fetch(:vendor, false)

data/lib/katello/tasks/fix_hostgroup_facets.rake

@@ -0,0 +1,8 @@
+namespace :katello do
+  desc "This task collates hostgroup content facts that were missed during the upgrade from audit.\
+        It then updates the hostgroup content_facet accordingly."
+  task :fix_hostgroup_facets => :environment do
+    User.current = User.anonymous_admin
+    ::Katello::Util::HostgroupFacetsHelper.new.main
+  end
+end

data/lib/katello/tasks/upgrades/4.1/update_content_import_export_perms.rake

@@ -0,0 +1,33 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.1' do
+      desc "Update for content import/export permissions."
+      task :update_content_import_export_perms => ['environment'] do
+        User.current = User.anonymous_api_admin
+
+        permission_map = {
+          Permission.find_by(name: :export_library_content) => Permission.find_by(name: :export_content),
+          Permission.find_by(name: :import_library_content) => Permission.find_by(name: :import_content)
+        }
+
+        permission_map.each do |old_perm, new_perm|
+          Filtering.where(permission_id: old_perm.id).update_all(:permission_id => new_perm.id) if old_perm
+        end
+
+        names = permission_map.keys.compact.map(&:name)
+        Permission.where(:name => names).destroy_all if names.any?
+
+        export_content_views = Permission.find_by_name(:export_content_views)
+        next if export_content_views.blank?
+
+        Filtering.where(permission_id: export_content_views.id).each do |filtering|
+          filter = filtering.filter
+          filter.role.add_permissions!(:export_content)
+          filter.destroy if filter.filterings.count == 1
+        end
+        Filtering.where(permission_id: export_content_views.id).destroy_all
+        export_content_views.destroy
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.0.rc2.2".freeze
+  VERSION = "4.1.0".freeze
 end

data/locale/action_names.rb

@@ -1,75 +1,75 @@
 # Autogenerated!
+_("Remote action:")
+_("Import")
+_("Export Library")
+_("Copy version units to library")
+_("Create Import History")
+_("Create Export History")
+_("Run Sync Plan:")
+_("Update")
+_("Enable")
+_("Verify checksum")
+_("Upload into")
+_("Upload errata into")
+_("Update http proxy details")
 _("Synchronize")
 _("Remove Content")
 _("Instance update")
-_("Index package groups")
 _("Index module streams")
-_("Index errata")
 _("Index content")
-_("Upload into")
-_("Filtered index content")
 _("Fetch pxe files")
-_("Export")
 _("Errata mail")
-_("Discover")
-_("Delete Package Group")
 _("Delete")
 _("Create")
-_("Update")
 _("Update http proxy")
-_("Reindex subscriptions")
 _("Delete Product")
-_("Product Create")
-_("Destroy")
 _("Combined Profile Update")
 _("Package Profile Update")
-_("Updating System Purpose for host")
-_("Update release version for host")
 _("Update for host")
-_("Update Content Overrides")
 _("Remove subscriptions")
-_("Hypervisors update")
 _("Hypervisors")
 _("Install Applicable Errata")
-_("Destroy Content Host")
 _("Auto attach subscriptions")
-_("Attach subscriptions")
 _("Publish Lifecycle Environment Repositories")
-_("Delete Lifecycle Environment")
 _("Republish Version Repositories")
 _("Incremental Update")
 _("Import Default Content View")
-_("Import Content View Version")
-_("Remove Version")
+_("Export")
 _("Remove from Environment")
 _("Remove Versions and Associations")
-_("Publish")
 _("Promotion to Environment")
 _("Promote")
-_("Remote action:")
+_("Publish")
+_("Remove Version")
+_("Import Content View Version")
+_("Delete Lifecycle Environment")
+_("Attach subscriptions")
+_("Destroy Content Host")
+_("Update Content Overrides")
+_("Update release version for host")
+_("Updating System Purpose for host")
+_("Destroy")
+_("Hypervisors update")
+_("Create Package Group")
+_("Disable")
+_("Update content urls")
+_("Product Create")
+_("Reindex subscriptions")
+_("Update redhat repository")
+_("Filtered index content")
+_("Index errata")
+_("Index package groups")
+_("Delete Package Group")
+_("Discover")
 _("Incremental Update of  Content View Version(s) ")
+_("Generate host applicability")
+_("Delete Activation Key")
+_("Abstract async task")
 _("Sync capsule")
 _("Synchronize smart proxy")
 _("Generate repository applicability")
 _("Bulk generate applicability for hosts")
-_("Generate host applicability")
 _("Agent action")
-_("Delete Activation Key")
-_("Abstract async task")
 _("Import Puppet classes")
 _("Import facts")
 _("Action with sub plans")
-_("Import")
-_("Export Library")
-_("Copy version units to library")
-_("Create Import History")
-_("Create Export History")
-_("Run Sync Plan:")
-_("Create Package Group")
-_("Disable")
-_("Verify checksum")
-_("Enable")
-_("Upload errata into")
-_("Update redhat repository")
-_("Update http proxy details")
-_("Update content urls")

data/locale/bn/katello.edit.po

@@ -10,7 +10,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: katello 2.4.0-RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-07 20:06+0000\n"
 "PO-Revision-Date: 2017-12-19 20:14+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/foreman/teams/114/bn/)\n"
@@ -509,7 +508,7 @@ msgid "Destination Server name"
 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: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."
+msgid "Split the exported content into archives no greater than the specified size in gigabytes."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:13 ../app/controllers/katello/api/v2/content_export_incrementals_controller.rb:33
@@ -3600,11 +3599,11 @@ msgstr ""
 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/repository/create.rb:50 ../app/lib/actions/katello/repository/create_root.rb:17 action_names.rb:17
+#: ../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:23
 msgid "Create"
 msgstr "নির্মাণ করুন"
 
-#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:57
+#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:66
 msgid "Delete Activation Key"
 msgstr ""
 
@@ -3620,11 +3619,11 @@ msgstr "কোনো প্যাকেজ মুছে ফেলা হয়ন
 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:86
+#: ../app/lib/actions/katello/agent_action.rb:90
 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:55
+#: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:65
 msgid "Generate host applicability"
 msgstr ""
 
@@ -3632,15 +3631,15 @@ msgstr ""
 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:54
+#: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:71
 msgid "Bulk generate applicability for hosts"
 msgstr ""
 
-#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:53
+#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:70
 msgid "Generate repository applicability"
 msgstr ""
 
-#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:52
+#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:69
 msgid "Synchronize smart proxy"
 msgstr ""
 
@@ -3652,7 +3651,7 @@ msgstr ""
 msgid "Sync Content View on Smart Proxy(ies)"
 msgstr ""
 
-#: ../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
+#: ../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:22
 msgid "Delete"
 msgstr "মুছে ফেলুন"
 
@@ -3704,7 +3703,7 @@ msgstr ""
 msgid "Cannot promote environment out of sequence. Use force to bypass restriction."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/promote_to_environment.rb:40 action_names.rb:47
+#: ../app/lib/actions/katello/content_view/promote_to_environment.rb:40 action_names.rb:40
 msgid "Promotion to Environment"
 msgstr ""
 
@@ -3716,7 +3715,7 @@ msgstr ""
 msgid "Content view has repository label '%s' which is not specified in repos_units parameter."
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/publish.rb:90 action_names.rb:46
+#: ../app/lib/actions/katello/content_view/publish.rb:90 action_names.rb:42
 msgid "Publish"
 msgstr "প্রকাশ করুন"
 
@@ -3728,7 +3727,7 @@ msgstr ""
 msgid "Cannot delete version while it is in environment %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:45
+#: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:39
 msgid "Remove Versions and Associations"
 msgstr ""
 
@@ -3748,7 +3747,7 @@ msgstr ""
 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:44
+#: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:38
 msgid "Remove from Environment"
 msgstr ""
 
@@ -3760,7 +3759,7 @@ msgstr ""
 msgid "Create Repositories"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/export.rb:31 ../app/lib/actions/katello/repository/export.rb:63 action_names.rb:12
+#: ../app/lib/actions/katello/content_view_version/export.rb:31 ../app/lib/actions/katello/repository/export.rb:63 action_names.rb:37
 msgid "Export"
 msgstr ""
 
@@ -3768,15 +3767,15 @@ msgstr ""
 msgid "Content view not provided in the metadata"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import.rb:40 action_names.rb:42
+#: ../app/lib/actions/katello/content_view_version/import.rb:41 action_names.rb:44
 msgid "Import Content View Version"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import_library.rb:14 action_names.rb:41
+#: ../app/lib/actions/katello/content_view_version/import_library.rb:14 action_names.rb:36
 msgid "Import Default Content View"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:16 action_names.rb:40
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:16 action_names.rb:35
 msgid "Incremental Update"
 msgstr ""
 
@@ -3800,15 +3799,15 @@ msgstr ""
 msgid "Republish Repositories of %{name} %{version}"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:27 action_names.rb:39
+#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:27 action_names.rb:34
 msgid "Republish Version Repositories"
 msgstr ""
 
-#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:38
+#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:45
 msgid "Delete Lifecycle Environment"
 msgstr ""
 
-#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:37
+#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:33
 msgid "Publish Lifecycle Environment Repositories"
 msgstr ""
 
@@ -3824,7 +3823,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:36
+#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:46
 msgid "Attach subscriptions"
 msgstr ""
 
@@ -3832,7 +3831,7 @@ msgstr ""
 msgid "Destroy Content Host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:34
+#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:47
 msgid "Destroy Content Host"
 msgstr ""
 
@@ -3844,7 +3843,7 @@ msgstr ""
 msgid "No applicable errata for %s, skipping"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:33
+#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:31
 msgid "Install Applicable Errata"
 msgstr ""
 
@@ -3936,7 +3935,7 @@ msgstr ""
 msgid "Remove subscriptions from %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:30
+#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:29
 msgid "Remove subscriptions"
 msgstr ""
 
@@ -3948,7 +3947,7 @@ msgstr ""
 msgid "Update Content Overrides to %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:29
+#: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:48
 msgid "Update Content Overrides"
 msgstr ""
 
@@ -3968,7 +3967,7 @@ msgstr ""
 msgid "Host %{name} cannot be assigned release version %{release_version}."
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:27
+#: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:49
 msgid "Update release version for host"
 msgstr ""
 
@@ -3980,7 +3979,7 @@ msgstr ""
 msgid "Updating System Purpose for host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:26
+#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:50
 msgid "Updating System Purpose for host"
 msgstr ""
 
@@ -3988,7 +3987,7 @@ msgstr ""
 msgid "Package Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:25
+#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:27
 msgid "Package Profile Update"
 msgstr ""
 
@@ -3996,11 +3995,11 @@ msgstr ""
 msgid "Combined Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:24
+#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:26
 msgid "Combined Profile Update"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:23
+#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:51
 msgid "Destroy"
 msgstr ""
 
@@ -4040,7 +4039,7 @@ msgstr ""
 msgid "Cannot delete redhat product content"
 msgstr ""
 
-#: ../app/lib/actions/katello/product/create.rb:37 action_names.rb:22
+#: ../app/lib/actions/katello/product/create.rb:37 action_names.rb:56
 msgid "Product Create"
 msgstr ""
 
@@ -4052,7 +4051,7 @@ msgstr ""
 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:21
+#: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:25
 msgid "Delete Product"
 msgstr ""
 
@@ -4068,7 +4067,7 @@ msgstr "Red Hat-র উপলব্ধকারী মুছে ফেলা য
 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:18
+#: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:188 action_names.rb:9
 msgid "Update"
 msgstr "আপডেট করুন"
 
@@ -4084,7 +4083,7 @@ msgstr ""
 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:15
+#: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:62
 msgid "Delete Package Group"
 msgstr ""
 
@@ -4096,7 +4095,7 @@ msgstr ""
 msgid "Unable to export. 'pulp_export_destination' setting is not a writable directory."
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/import_upload.rb:59 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:9
+#: ../app/lib/actions/katello/repository/import_upload.rb:59 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:12
 msgid "Upload into"
 msgstr ""
 
@@ -4108,7 +4107,7 @@ msgstr ""
 msgid "Can only remove content from within the Default Content View"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:3
+#: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:16
 msgid "Remove Content"
 msgstr ""
 
@@ -4132,19 +4131,19 @@ msgstr ""
 msgid "Synchronize: Skip Metadata Check"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:100 action_names.rb:2
+#: ../app/lib/actions/katello/repository/sync.rb:100 action_names.rb:15
 msgid "Synchronize"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:72
+#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:13
 msgid "Upload errata into"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:68
+#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:53
 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:69
+#: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:54
 msgid "Disable"
 msgstr ""
 
@@ -4152,7 +4151,7 @@ msgstr ""
 msgid "Repository not found"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:71
+#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:10
 msgid "Enable"
 msgstr ""
 
@@ -4160,7 +4159,7 @@ msgstr ""
 msgid "The repository is already enabled"
 msgstr ""
 
-#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:67
+#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:8
 msgid "Run Sync Plan:"
 msgstr ""
 
@@ -4320,15 +4319,15 @@ msgstr ""
 msgid "Group %{id} already created."
 msgstr ""
 
-#: ../app/lib/actions/pulp3/content_view_version/create_export_history.rb:52 action_names.rb:66
+#: ../app/lib/actions/pulp3/content_view_version/create_export_history.rb:52 action_names.rb:7
 msgid "Create Export History"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/content_view_version/create_import_history.rb:29 action_names.rb:65
+#: ../app/lib/actions/pulp3/content_view_version/create_import_history.rb:29 action_names.rb:6
 msgid "Create Import History"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:63
+#: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:4
 msgid "Export Library"
 msgstr ""
 
@@ -4338,7 +4337,7 @@ msgid ""
 " %{repos}"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:49 action_names.rb:62
+#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:49 action_names.rb:3
 msgid "Import"
 msgstr ""
 
@@ -4398,7 +4397,7 @@ msgstr ""
 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
+#: ../app/lib/katello/http_resource.rb:83 ../app/lib/katello/http_resource.rb:97 ../app/lib/katello/http_resource.rb:111 ../app/lib/katello/http_resource.rb:125
 msgid "A backend service [ %s ] is unreachable"
 msgstr ""
 
@@ -6352,47 +6351,55 @@ msgstr ""
 msgid "Failed indexing errata, maximum retries encountered"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/export.rb:102
+#: ../app/services/katello/pulp3/content_view_version/export.rb:98
+msgid "Specify an export chunk size less than 1_000_000 GB"
+msgstr ""
+
+#: ../app/services/katello/pulp3/content_view_version/export.rb:111
 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:123
+#: ../app/services/katello/pulp3/content_view_version/export.rb:132
 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:155
+#: ../app/services/katello/pulp3/content_view_version/export.rb:164
 msgid "Product: '%{product}', Repository: '%{repository}'"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:39
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:40
 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:53
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:54
 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:81
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:64
+msgid "No manifest found. Import a manifest with the appropriate subscriptions before importing content."
+msgstr ""
+
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:91
 msgid ""
 "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:100
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:126
 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 organization's manifest does not contain the subscriptions required to enable the following repositories.\n"
 " %{repos}"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:110
+#: ../app/services/katello/pulp3/content_view_version/import_validator.rb:135
 msgid ""
 "\n"
 "* Product = '%{product}', Repository = '%{repository}'"
 msgstr ""
 
-#: ../app/services/katello/pulp3/content_view_version/importable_repositories.rb:33
+#: ../app/services/katello/pulp3/content_view_version/importable_repositories.rb:38
 msgid "Unable to find product '%s' in organization '%s'"
 msgstr ""
 
@@ -8180,114 +8187,114 @@ msgstr ""
 msgid "The subscription is no longer available"
 msgstr ""
 
-#: action_names.rb:4
-msgid "Instance update"
+#: action_names.rb:2
+msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Index package groups"
+msgid "Copy version units to library"
 msgstr ""
 
-#: action_names.rb:6
-msgid "Index module streams"
+#: action_names.rb:11
+msgid "Verify checksum"
 msgstr ""
 
-#: action_names.rb:7
-msgid "Index errata"
+#: action_names.rb:14
+msgid "Update http proxy details"
 msgstr ""
 
-#: action_names.rb:8
-msgid "Index content"
+#: action_names.rb:17
+msgid "Instance update"
 msgstr ""
 
-#: action_names.rb:10
-msgid "Filtered index content"
+#: action_names.rb:18
+msgid "Index module streams"
 msgstr ""
 
-#: action_names.rb:11
-msgid "Fetch pxe files"
+#: action_names.rb:19
+msgid "Index content"
 msgstr ""
 
-#: action_names.rb:13
-msgid "Errata mail"
+#: action_names.rb:20
+msgid "Fetch pxe files"
 msgstr ""
 
-#: action_names.rb:14
-msgid "Discover"
+#: action_names.rb:21
+msgid "Errata mail"
 msgstr ""
 
-#: action_names.rb:19
+#: action_names.rb:24
 msgid "Update http proxy"
 msgstr ""
 
-#: action_names.rb:20
-msgid "Reindex subscriptions"
-msgstr ""
-
-#: action_names.rb:31
-msgid "Hypervisors update"
-msgstr ""
-
-#: action_names.rb:32
+#: action_names.rb:30
 msgid "Hypervisors"
 msgstr ""
 
-#: action_names.rb:35
+#: action_names.rb:32
 msgid "Auto attach subscriptions"
 msgstr ""
 
-#: action_names.rb:48
+#: action_names.rb:41
 msgid "Promote"
 msgstr ""
 
-#: action_names.rb:49
-msgid "Remote action:"
-msgstr ""
-
-#: action_names.rb:50
-msgid "Incremental Update of  Content View Version(s) "
+#: action_names.rb:52
+msgid "Hypervisors update"
 msgstr ""
 
-#: action_names.rb:51
-msgid "Sync capsule"
+#: action_names.rb:55
+msgid "Update content urls"
 msgstr ""
 
-#: action_names.rb:56
-msgid "Agent action"
+#: action_names.rb:57
+msgid "Reindex subscriptions"
 msgstr ""
 
 #: action_names.rb:58
-msgid "Abstract async task"
+msgid "Update redhat repository"
 msgstr ""
 
 #: action_names.rb:59
-msgid "Import Puppet classes"
+msgid "Filtered index content"
 msgstr ""
 
 #: action_names.rb:60
-msgid "Import facts"
+msgid "Index errata"
 msgstr ""
 
 #: action_names.rb:61
-msgid "Action with sub plans"
+msgid "Index package groups"
+msgstr ""
+
+#: action_names.rb:63
+msgid "Discover"
 msgstr ""
 
 #: action_names.rb:64
-msgid "Copy version units to library"
+msgid "Incremental Update of  Content View Version(s) "
 msgstr ""
 
-#: action_names.rb:70
-msgid "Verify checksum"
+#: action_names.rb:67
+msgid "Abstract async task"
+msgstr ""
+
+#: action_names.rb:68
+msgid "Sync capsule"
+msgstr ""
+
+#: action_names.rb:72
+msgid "Agent action"
 msgstr ""
 
 #: action_names.rb:73
-msgid "Update redhat repository"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:74
-msgid "Update http proxy details"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:75
-msgid "Update content urls"
+msgid "Action with sub plans"
 msgstr ""