katello 4.0.0.rc3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1f2f557b3626c3063d82e67d89ad487eb532ceae69ebd8b3d17a5e6c1d1f58
-  data.tar.gz: 4740bb46003409a84d0e3ff4d83d265e872c59744afd996c7d930e41978c8ec7
+  metadata.gz: a68ac9c26daead6a548c835d225d8dbebe0ce33ca5b6315b6505ef64660d9ee6
+  data.tar.gz: '09d66a70cef13109aff1e38a9e409862c5cae6263c5c7aea415399c7cd0e08b0'
 SHA512:
-  metadata.gz: d2b588283c5bfc2f7ffe233be131fc45579531bee31b5202216e20be8f7fd4178a9080b34262dbfe46c25d463f9638c10f1c9820f5c6ecdb6fdcd1b73e1ad64a
-  data.tar.gz: 63fe08f466e464a3e628ca3e44dec60a46f2480bb88598798511175e05afdf43becbdfb8586edf5ca3ec13e37c67c3bf5b3ddb0315cd604ed5d82b315d3b6632
+  metadata.gz: cd9715ea64ef37bf05df3ae49a209e15f0ffe0c51d8f69d4b3fcba119909349fea1fe1ab4f464240515057e1529304850176ec5a48cbbfb25cd04fb1ee788137
+  data.tar.gz: 6ab0c5c117c51017b37ca1366fc05f64efcc7a17375e2bb4ac9ee3633990baedf68ba505cc29292295f5a01e31ac6fd4bef209d9272e2f5cfce0f3f9c7f29a65

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -184,8 +184,8 @@ module Katello
                          'application/vnd.docker.distribution.manifest.v1+prettyjws'
                        end
         end
-
-        render json: manifest_response, content_type: media_type
+        response.headers['Content-Type'] = media_type
+        render json: manifest_response
       end
     end
 

data/app/helpers/katello/katello_urls_helper.rb

@@ -20,7 +20,7 @@ module Katello
       "#{prefix}/pub/#{config}"
     end
 
-    def repository_url(content_path, content_type = 'repos', schema = 'http')
+    def repository_url(content_path, _content_type = nil, schema = 'http')
       return content_path if content_path =~ %r|^([\w\-\+]+)://|
       url = if @host.content_source
               "#{schema}://#{@host.content_source.hostname}"
@@ -33,7 +33,7 @@ module Katello
       end
       path = ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(
         @host.lifecycle_environment, content_path)
-      "#{url}/pulp/#{content_type}/#{path}"
+      "#{url}/pulp/content/#{path}"
     end
   end
 end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -59,7 +59,7 @@ module Katello
           :in => DOWNLOAD_POLICIES,
           :message => _("must be one of the following: %s") % DOWNLOAD_POLICIES.join(', ')
         }
-        scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE) }
+        scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE, PULP3_FEATURE) }
 
         def self.with_repo(repo)
           joins(:capsule_lifecycle_environments).

data/app/models/katello/glue/pulp/repo.rb

@@ -76,7 +76,7 @@ module Katello
 
       def uri
         uri = URI.parse(SETTINGS[:katello][:pulp][:url])
-        "https://#{uri.host}/pulp/repos/#{relative_path}"
+        "https://#{uri.host}/pulp/content/#{relative_path}"
       end
 
       def to_hash
@@ -365,23 +365,17 @@ module Katello
       end
     end
 
-    def full_path(smart_proxy = nil, force_https = false)
+    def full_path(smart_proxy = nil, force_http = false)
       pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : SETTINGS[:katello][:pulp][:url])
-      scheme   = (self.unprotected && !force_https) ? 'http' : 'https'
+      scheme = force_http ? 'http' : 'https'
       if docker?
         "#{pulp_uri.host.downcase}/#{container_repository_name}"
-      elsif file?
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/isos/#{relative_path}/"
-      elsif puppet?
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/puppet/#{pulp_id}/"
       elsif ostree?
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/ostree/web/#{relative_path}"
-      elsif deb?
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/deb/#{relative_path}/"
+        "#{scheme}://#{pulp_uri.host.downcase}/pulp/content/web/#{relative_path}"
       elsif ansible_collection?
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/content/#{relative_path}/"
+        "#{scheme}://#{pulp_uri.host.downcase}/pulp_ansible/galaxy/#{relative_path}/api"
       else
-        "#{scheme}://#{pulp_uri.host.downcase}/pulp/repos/#{relative_path}/"
+        "#{scheme}://#{pulp_uri.host.downcase}/pulp/content/#{relative_path}/"
       end
     end
   end

data/app/models/katello/host/content_facet.rb

@@ -35,7 +35,7 @@ module Katello
         prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
 
-        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2"]
+        # paths == ["/pulp/content/Default_Organization/Library/custom/Test_product/test2"]
         paths.each do |path|
           if (prefix = prefixes.find { |pre| path.start_with?(pre) })
             relative_paths << path.gsub(prefix, '')

data/app/models/katello/ping.rb

@@ -97,10 +97,10 @@ module Katello
         end
       end
 
-      def ping_pulp_with_auth(service_result, pulp_without_auth_status)
+      def ping_pulp_with_auth(service_result, pulp_without_auth_status, capsule_id)
         exception_watch(service_result) do
           if pulp_without_auth_status == OK_RETURN_CODE
-            Katello.pulp_server.resources.user.retrieve_all
+            Katello::Pulp::Server.config(pulp_url(capsule_id), User.remote_user).resources.user.retrieve_all
           else
             fail _("Skipped pulp_auth check after failed pulp check")
           end
@@ -161,7 +161,7 @@ module Katello
       def pulp_url(capsule_id)
         proxy = fetch_proxy(capsule_id)
         uri = URI.parse(proxy.pulp_url)
-        "#{uri.scheme}://#{uri.host.downcase}/pulp/api/v2"
+        "#{uri.scheme}://#{uri.host.downcase}/pulp/api/v2/"
       end
 
       # this checks Pulp is running and responding without need
@@ -236,7 +236,7 @@ module Katello
         ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
         ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)
 
-        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status]) if result.include?(:pulp_auth)
+        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status], capsule_id) if result.include?(:pulp_auth)
         ping_candlepin_with_auth(result[:candlepin_auth]) if result.include?(:candlepin_auth)
         ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
         ping_katello_events(result[:katello_events]) if result.include?(:katello_events)

data/app/services/katello/managed_content_medium_provider.rb

@@ -9,7 +9,7 @@ module Katello
     end
 
     def medium_uri(path = "")
-      url = kickstart_repo.full_path(entity.content_source)
+      url = kickstart_repo.full_path(entity.content_source, true)
       url += '/' + path unless path.empty?
       URI.parse(url)
     end

data/app/services/katello/pulp/repository/yum.rb

@@ -24,7 +24,7 @@ module Katello
         end
 
         def partial_repo_path
-          "/pulp/repos/#{repo.relative_path}/".sub('//', '/')
+          "/pulp/content/#{repo.relative_path}/".sub('//', '/')
         end
 
         def importer_class

data/app/services/katello/pulp3/migration.rb

@@ -127,7 +127,7 @@ module Katello
         plan = { plugins: plugins }
 
         # TODO: Don't provide the plan as a string once this is resolved: https://pulp.plan.io/issues/8211
-        migration_plan_api.reset(migration_plan_api.create(plan: plan).pulp_href, plan.to_json)
+        migration_plan_api.reset(migration_plan_api.create(plan: plan).pulp_href)
 
         content_types_for_migration.each do |content_type|
           if content_type.model_class == ::Katello::Erratum
@@ -316,7 +316,7 @@ module Katello
           unmigrated_units.select(:id, :pulp_id).find_in_batches(batch_size: GET_QUERY_ID_LENGTH) do |needing_hrefs|
             current_count += needing_hrefs.count
             update_import_status("Importing migrated content type #{content_type.label}: #{current_count}/#{total_count}")
-            migrated_units = pulp2_content_api.list(pulp2_id__in: needing_hrefs.map { |unit| unit.pulp_id }.join(','))
+            migrated_units = pulp2_content_api.list(pulp2_id__in: needing_hrefs.map(&:pulp_id))
             migrated_units.results.each do |migrated_unit|
               content_type.model_class.where(pulp_id: migrated_unit.pulp2_id).update_all(migrated_pulp3_href: migrated_unit.pulp3_content)
             end

data/app/services/katello/pulp3/repository.rb

@@ -162,10 +162,7 @@ module Katello
       end
 
       def compute_remote_options(computed_options = remote_options)
-        [:client_cert, :client_key, :ca_cert].each do |key|
-          computed_options[key] = Digest::SHA256.hexdigest(computed_options[key].chomp) if computed_options[key]
-        end
-        computed_options.except(:name)
+        computed_options.except(:name, :client_key)
       end
 
       def create

data/app/services/katello/pulp3/repository/yum.rb

@@ -81,7 +81,7 @@ module Katello
         end
 
         def partial_repo_path
-          "/pulp/repos/#{repo.relative_path}/".sub('//', '/')
+          "/pulp/content/#{repo.relative_path}/".sub('//', '/')
         end
 
         def multi_copy_units(repo_id_map, dependency_solving)

data/app/services/katello/pulp3/task_group.rb

@@ -71,8 +71,11 @@ module Katello
       end
 
       def error
+        return if task_group_data[WAITING] > 0 || task_group_data[RUNNING] > 0
         if task_group_data[FAILED] > 0
           "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}."
+        elsif task_group_data[CANCELLED] > 0
+          "#{task_group_data[CANCELLED]} subtask(s) cancelled for task group #{@href}."
         end
       end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.0.0.rc3.1".freeze
+  VERSION = "4.0.0".freeze
 end

data/locale/action_names.rb

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

data/locale/bn/katello.edit.po

@@ -1461,7 +1461,7 @@ msgid "Invalid params provided - date_type must be one of %s"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/errata_controller.rb:65
-msgid "Return errata that can be added to the Content View Version via an Incremental Update"
+msgid "Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/errata_controller.rb:89 ../app/controllers/katello/api/v2/packages_controller.rb:98
@@ -1645,7 +1645,7 @@ msgid "Host ID"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/host_errata_controller.rb:54
-msgid "List of Errata ids to install"
+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
@@ -2127,124 +2127,124 @@ msgstr ""
 msgid "Medium IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:25 ../app/controllers/katello/api/v2/organizations_controller.rb:27
-msgid "Provisioning template IDs"
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:25
+msgid "Partition template IDs"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/organizations_controller.rb:26
-msgid "Partition template IDs"
+msgid "Provisioning template IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:28
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:27
 msgid "Domain IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:29
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:28
 msgid "Realm IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:30
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:29
 msgid "Host group IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:31
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:30
 msgid "Environment IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:32
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:31
 msgid "Subnet IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:34
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:33
 msgid "Associated location IDs"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:42
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:41
 msgid "List all organizations"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:50
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:49
 msgid "Show organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:51 ../app/controllers/katello/api/v2/organizations_controller.rb:58
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:50 ../app/controllers/katello/api/v2/organizations_controller.rb:57
 msgid "organization ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:57
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:56
 msgid "Update organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:59 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:166
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:58 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:169
 #, fuzzy
 msgid "Red Hat CDN URL"
 msgstr "উৎপাদন"
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:69
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:68
 msgid "Create organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:84
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:83
 msgid "Delete an organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:85 ../app/controllers/katello/api/v2/organizations_controller.rb:92 ../app/controllers/katello/api/v2/products_controller.rb:90 ../app/controllers/katello/api/v2/repositories_controller.rb:265 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:20 ../app/controllers/katello/api/v2/simple_content_access_controller.rb:28 ../app/controllers/katello/api/v2/subscriptions_controller.rb:24 ../app/controllers/katello/api/v2/subscriptions_controller.rb:128 ../app/controllers/katello/api/v2/sync_plans_controller.rb:23 ../app/controllers/katello/api/v2/sync_plans_controller.rb:43 ../app/controllers/katello/api/v2/sync_plans_controller.rb:50 ../app/controllers/katello/api/v2/sync_plans_controller.rb:67 ../app/controllers/katello/api/v2/sync_plans_controller.rb:84 ../app/controllers/katello/api/v2/sync_plans_controller.rb:91 ../app/controllers/katello/api/v2/sync_plans_controller.rb:102 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:20 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:37 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:49 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:62 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:89 ../app/controllers/katello/api/v2/upstream_subscriptions_controller.rb:97
+#: ../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
 msgid "Organization ID"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:91
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:90
 msgid "Discover Repositories"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:93
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:92
 msgid "Base URL to perform repo discovery on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:94
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:93
 msgid "One of yum or docker"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:95
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:94
 msgid "Username to access URL"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:96
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:95
 msgid "Password to access URL"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:97
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:96
 msgid "Search pattern (defaults to '*')"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:99
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:98
 msgid "url not defined."
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:106
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:105
 msgid "Cancel repository discovery"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:107 ../app/controllers/katello/api/v2/organizations_controller.rb:115
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:106 ../app/controllers/katello/api/v2/organizations_controller.rb:114
 msgid "Organization label"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:108
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:107
 msgid "base url to perform repo discovery on"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:114
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:113
 msgid "Download a debug certificate"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:124
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:123
 msgid "List available releases in the organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:125
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:124
 msgid "ID of the Organization"
 msgstr ""
 
-#: ../app/controllers/katello/api/v2/organizations_controller.rb:136
+#: ../app/controllers/katello/api/v2/organizations_controller.rb:135
 msgid "List all :resource_id"
 msgstr ""
 
@@ -3328,19 +3328,19 @@ msgstr "এই কাজের অনুরোধের সাথে প্র
 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/v2/authorization.rb:42
-msgid "Could not find %{name} resource with id %{id}"
+#: ../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:51
+#: ../app/controllers/katello/concerns/api/v2/authorization.rb:64
 msgid "Could not find %{name} resources with ids %{ids}"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/authorization.rb:63
+#: ../app/controllers/katello/concerns/api/v2/authorization.rb:76
 msgid "One or more ids (%{ids}) were not found for %{assoc}.  You may not have permissions to see them."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/api/v2/authorization.rb:67
+#: ../app/controllers/katello/concerns/api/v2/authorization.rb:80
 msgid "Unfiltered params array: %s."
 msgstr ""
 
@@ -3573,15 +3573,15 @@ msgstr ""
 msgid "Organization %s is being deleted."
 msgstr ""
 
-#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:36
+#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:35
 msgid "Error connecting. Got: %s"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:38
+#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:37
 msgid "Error retrieving Pulp storage"
 msgstr ""
 
-#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:49
+#: ../app/controllers/katello/concerns/smart_proxies_controller_extensions.rb:48
 msgid "Error connecting to Pulp service"
 msgstr ""
 
@@ -3616,19 +3616,19 @@ msgstr ""
 msgid "Reset Puppet Environment"
 msgstr ""
 
-#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:36
+#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:31
 msgid "On Demand"
 msgstr ""
 
-#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:40
+#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:35
 msgid "Background"
 msgstr ""
 
-#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:44
+#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:39
 msgid "Immediate"
 msgstr ""
 
-#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:48
+#: ../app/helpers/katello/concerns/smart_proxy_helper_extensions.rb:43
 msgid "Inherit from Repository"
 msgstr ""
 
@@ -3697,11 +3697,11 @@ msgid "The puppet environment %{name} is in use by %{count} Host Group(s) includ
 msgstr ""
 
 # translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
-#: ../app/lib/actions/katello/activation_key/create.rb:21 ../app/lib/actions/katello/content_view/create.rb:10 ../app/lib/actions/katello/content_view/environment_create.rb:16 ../app/lib/actions/katello/content_view_puppet_environment/create.rb:29 ../app/lib/actions/katello/environment/library_create.rb:24 ../app/lib/actions/katello/organization/create.rb:33 ../app/lib/actions/katello/repository/create.rb:50 ../app/lib/actions/katello/repository/create_root.rb:17 action_names.rb:21
+#: ../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
 msgid "Create"
 msgstr "নির্মাণ করুন"
 
-#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:41
+#: ../app/lib/actions/katello/activation_key/destroy.rb:19 action_names.rb:69
 msgid "Delete Activation Key"
 msgstr ""
 
@@ -3723,7 +3723,7 @@ msgstr ""
 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:40
+#: ../app/lib/actions/katello/applicability/host/generate.rb:22 action_names.rb:71
 msgid "Generate host applicability"
 msgstr ""
 
@@ -3731,15 +3731,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:39
+#: ../app/lib/actions/katello/applicability/hosts/bulk_generate.rb:30 action_names.rb:73
 msgid "Bulk generate applicability for hosts"
 msgstr ""
 
-#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:62
+#: ../app/lib/actions/katello/applicability/repository/regenerate.rb:25 action_names.rb:2
 msgid "Generate repository applicability"
 msgstr ""
 
-#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:66
+#: ../app/lib/actions/katello/capsule_content/sync.rb:14 action_names.rb:3
 msgid "Synchronize smart proxy"
 msgstr ""
 
@@ -3752,7 +3752,7 @@ msgid "Sync Content View on Smart Proxy(ies)"
 msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.0, document foreman, author Runa Bhattacharjee
-#: ../app/lib/actions/katello/content_view/destroy.rb:34 ../app/lib/actions/katello/content_view_puppet_environment/destroy.rb:23 ../app/lib/actions/katello/content_view_puppet_module/destroy.rb:41 ../app/lib/actions/katello/provider/destroy.rb:19 ../app/lib/actions/katello/repository/destroy.rb:67 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:259 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:274 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:27 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:90 action_names.rb:32
+#: ../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
 msgid "Delete"
 msgstr "মুছে ফেলুন"
 
@@ -3808,7 +3808,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:43 action_names.rb:36
+#: ../app/lib/actions/katello/content_view/promote_to_environment.rb:43 action_names.rb:20
 msgid "Promotion to Environment"
 msgstr ""
 
@@ -3821,7 +3821,7 @@ msgid "Content view has repository label '%s' which is not specified in repos_un
 msgstr ""
 
 # translation auto-copied from project Satellite6 Katello, version Sam-1.3.0, document katello, author bnin
-#: ../app/lib/actions/katello/content_view/publish.rb:100 action_names.rb:35
+#: ../app/lib/actions/katello/content_view/publish.rb:100 action_names.rb:9
 msgid "Publish"
 msgstr "প্রকাশ করুন"
 
@@ -3834,7 +3834,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:34
+#: ../app/lib/actions/katello/content_view/remove.rb:86 action_names.rb:28
 #, fuzzy
 msgid "Remove Versions and Associations"
 msgstr "প্রতিষ্ঠান পড়া হবে"
@@ -3856,12 +3856,12 @@ 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:33
+#: ../app/lib/actions/katello/content_view/remove_from_environment.rb:35 action_names.rb:23
 #, fuzzy
 msgid "Remove from Environment"
 msgstr "এনভায়রনমেন্ট পড়া হবে"
 
-#: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:56
+#: ../app/lib/actions/katello/content_view/remove_version.rb:26 action_names.rb:24
 #, fuzzy
 msgid "Remove Version"
 msgstr "ভূমিকার অনুমতি পড়া হবে"
@@ -3874,7 +3874,7 @@ msgstr ""
 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:3
+#: ../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
 msgid "Export"
 msgstr ""
 
@@ -3882,15 +3882,15 @@ msgstr ""
 msgid "This action will become available after the Pulp 3 content migration"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import.rb:26 action_names.rb:31
+#: ../app/lib/actions/katello/content_view_version/import.rb:26 action_names.rb:14
 msgid "Import Content View Version"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/import_library.rb:12 action_names.rb:30
+#: ../app/lib/actions/katello/content_view_version/import_library.rb:12 action_names.rb:11
 msgid "Import Default Content View"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:17 action_names.rb:28
+#: ../app/lib/actions/katello/content_view_version/incremental_update.rb:17 action_names.rb:12
 msgid "Incremental Update"
 msgstr ""
 
@@ -3918,16 +3918,16 @@ msgstr ""
 msgid "Republish Repositories of %{name} %{version}"
 msgstr ""
 
-#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:31 action_names.rb:29
+#: ../app/lib/actions/katello/content_view_version/republish_repositories.rb:31 action_names.rb:17
 msgid "Republish Version Repositories"
 msgstr ""
 
-#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:57
+#: ../app/lib/actions/katello/environment/destroy.rb:36 action_names.rb:15
 #, fuzzy
 msgid "Delete Lifecycle Environment"
 msgstr "এনভায়রনমেন্ট অনুযায়ী"
 
-#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:27
+#: ../app/lib/actions/katello/environment/publish_repositories.rb:33 action_names.rb:18
 msgid "Publish Lifecycle Environment Repositories"
 msgstr ""
 
@@ -3944,7 +3944,7 @@ msgstr "অজানা"
 msgid "Attach subscriptions to %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:26
+#: ../app/lib/actions/katello/host/attach_subscriptions.rb:49 action_names.rb:19
 msgid "Attach subscriptions"
 msgstr ""
 
@@ -3952,7 +3952,7 @@ msgstr ""
 msgid "Destroy Content Host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:68
+#: ../app/lib/actions/katello/host/destroy.rb:32 action_names.rb:22
 msgid "Destroy Content Host"
 msgstr ""
 
@@ -3964,7 +3964,7 @@ msgstr ""
 msgid "No applicable errata for %s, skipping"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:24
+#: ../app/lib/actions/katello/host/erratum/applicable_errata_install.rb:31 action_names.rb:25
 msgid "Install Applicable Errata"
 msgstr ""
 
@@ -4061,7 +4061,7 @@ msgstr ""
 msgid "Remove subscriptions from %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:58
+#: ../app/lib/actions/katello/host/remove_subscriptions.rb:40 action_names.rb:33
 msgid "Remove subscriptions"
 msgstr ""
 
@@ -4073,7 +4073,7 @@ msgstr ""
 msgid "Update Content Overrides to %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:52
+#: ../app/lib/actions/katello/host/update_content_overrides.rb:32 action_names.rb:29
 msgid "Update Content Overrides"
 msgstr ""
 
@@ -4081,7 +4081,7 @@ msgstr ""
 msgid "Host %s has not been registered with subscription-manager."
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:49
+#: ../app/lib/actions/katello/host/update_content_view.rb:18 action_names.rb:30
 msgid "Update for host"
 msgstr ""
 
@@ -4093,7 +4093,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:64
+#: ../app/lib/actions/katello/host/update_release_version.rb:21 action_names.rb:31
 msgid "Update release version for host"
 msgstr ""
 
@@ -4105,7 +4105,7 @@ msgstr ""
 msgid "Updating System Purpose for host %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:50
+#: ../app/lib/actions/katello/host/update_system_purpose.rb:25 action_names.rb:32
 msgid "Updating System Purpose for host"
 msgstr ""
 
@@ -4113,7 +4113,7 @@ msgstr ""
 msgid "Package Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:63
+#: ../app/lib/actions/katello/host/upload_package_profile.rb:22 action_names.rb:61
 msgid "Package Profile Update"
 msgstr ""
 
@@ -4121,11 +4121,11 @@ msgstr ""
 msgid "Combined Profile Update for %s"
 msgstr ""
 
-#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:47
+#: ../app/lib/actions/katello/host/upload_profiles.rb:24 action_names.rb:34
 msgid "Combined Profile Update"
 msgstr ""
 
-#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:65
+#: ../app/lib/actions/katello/organization/destroy.rb:30 action_names.rb:35
 msgid "Destroy"
 msgstr ""
 
@@ -4168,7 +4168,7 @@ msgstr ""
 msgid "Cannot delete redhat product content"
 msgstr ""
 
-#: ../app/lib/actions/katello/product/create.rb:38 action_names.rb:46
+#: ../app/lib/actions/katello/product/create.rb:38 action_names.rb:36
 msgid "Product Create"
 msgstr ""
 
@@ -4180,7 +4180,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:53
+#: ../app/lib/actions/katello/product/destroy.rb:65 action_names.rb:37
 msgid "Delete Product"
 msgstr ""
 
@@ -4198,7 +4198,7 @@ msgid "Cannot delete provider with attached products"
 msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.0, document foreman
-#: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:185 action_names.rb:5
+#: ../app/lib/actions/katello/provider/update.rb:12 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:188 action_names.rb:8
 msgid "Update"
 msgstr "আপডেট করুন"
 
@@ -4214,7 +4214,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:20
+#: ../app/lib/actions/katello/repository/destroy_package_group.rb:21 action_names.rb:40
 msgid "Delete Package Group"
 msgstr ""
 
@@ -4227,7 +4227,7 @@ msgid "Unable to export. 'pulp_export_destination' setting is not a writable dir
 msgstr ""
 
 # translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
-#: ../app/lib/actions/katello/repository/import_upload.rb:60 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:8
+#: ../app/lib/actions/katello/repository/import_upload.rb:60 ../app/lib/actions/katello/repository/upload_files.rb:46 action_names.rb:43
 #, fuzzy
 msgid "Upload into"
 msgstr "আপলোড করা হচ্ছে"
@@ -4240,7 +4240,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:12
+#: ../app/lib/actions/katello/repository/remove_content.rb:56 action_names.rb:50
 msgid "Remove Content"
 msgstr ""
 
@@ -4264,20 +4264,20 @@ msgstr ""
 msgid "Synchronize: Skip Metadata Check"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/sync.rb:98 action_names.rb:11
+#: ../app/lib/actions/katello/repository/sync.rb:98 action_names.rb:51
 #, fuzzy
 msgid "Synchronize"
 msgstr "সুসংগতি"
 
-#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:9
+#: ../app/lib/actions/katello/repository/upload_errata.rb:33 action_names.rb:55
 msgid "Upload errata into"
 msgstr ""
 
-#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:48
+#: ../app/lib/actions/katello/repository/upload_package_group.rb:28 action_names.rb:56
 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:51
+#: ../app/lib/actions/katello/repository_set/disable_repository.rb:6 ../webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js:10 action_names.rb:58
 msgid "Disable"
 msgstr ""
 
@@ -4286,7 +4286,7 @@ msgstr ""
 msgid "Repository not found"
 msgstr "সংগ্রহস্থল"
 
-#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:6
+#: ../app/lib/actions/katello/repository_set/enable_repository.rb:6 action_names.rb:59
 msgid "Enable"
 msgstr ""
 
@@ -4295,7 +4295,7 @@ msgstr ""
 msgid "The repository is already enabled"
 msgstr "'%s' সংগ্রহস্থল সক্রিয় করা হয়েছে"
 
-#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:69
+#: ../app/lib/actions/katello/sync_plan/run.rb:36 action_names.rb:60
 msgid "Run Sync Plan:"
 msgstr ""
 
@@ -4359,7 +4359,7 @@ msgstr ""
 msgid "waiting for Pulp to finish the task"
 msgstr ""
 
-#: ../app/lib/actions/pulp/consumer/destroy.rb:12 ../app/services/katello/registration_manager.rb:266
+#: ../app/lib/actions/pulp/consumer/destroy.rb:12 ../app/services/katello/registration_manager.rb:268
 msgid "Pulp Consumer %s has already been removed"
 msgstr ""
 
@@ -4474,11 +4474,15 @@ msgstr ""
 msgid "Content Migration"
 msgstr ""
 
+#: ../app/lib/actions/pulp3/content_migration_reset.rb:14
+msgid "Content Migration Reset"
+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:2
+#: ../app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb:37 action_names.rb:63
 msgid "Export Library"
 msgstr ""
 
@@ -4488,7 +4492,7 @@ msgid ""
 " %{repos}"
 msgstr ""
 
-#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:37 action_names.rb:72
+#: ../app/lib/actions/pulp3/orchestration/content_view_version/import.rb:37 action_names.rb:64
 msgid "Import"
 msgstr ""
 
@@ -5546,7 +5550,7 @@ msgstr "%s ব্যবহারকারীর জন্য ডিফল্ট
 msgid "You cannot set an organization's parent_id. This feature is disabled."
 msgstr "%s ব্যবহারকারীর জন্য ডিফল্ট প্রতিষ্ঠান ও এনভায়রনমেন্ট নির্ধারণ করা হয়নি।"
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:60 ../app/models/katello/content_view_erratum_filter_rule.rb:26 ../app/models/katello/root_repository.rb:85 ../app/models/katello/root_repository.rb:89 ../app/models/katello/root_repository.rb:93
+#: ../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
 msgid "must be one of the following: %s"
 msgstr ""
 
@@ -5554,15 +5558,15 @@ msgstr ""
 msgid "Could not find a smart proxy with pulp feature."
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:299
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:327
 msgid "Could not remove the lifecycle environment from the smart proxy"
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:302
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:330
 msgid "Lifecycle environment was not attached to the smart proxy; therefore, no changes were made."
 msgstr ""
 
-#: ../app/models/katello/concerns/smart_proxy_extensions.rb:340 ../app/models/katello/concerns/smart_proxy_extensions.rb:346
+#: ../app/models/katello/concerns/smart_proxy_extensions.rb:368 ../app/models/katello/concerns/smart_proxy_extensions.rb:374
 msgid "%s is unreachable. %s"
 msgstr ""
 
@@ -5835,10 +5839,6 @@ msgstr ""
 msgid "Cannot add composite versions to another composite content view"
 msgstr ""
 
-#: ../app/models/katello/content_view_version_export_history.rb:15
-msgid "Invalid export_type from one of the following: %s"
-msgstr ""
-
 #: ../app/models/katello/errata_status.rb:27
 msgid "Security errata installable"
 msgstr ""
@@ -5968,43 +5968,43 @@ msgstr ""
 msgid "Lifecycle Environment"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:63
+#: ../app/models/katello/ping.rb:55
 msgid "Not running"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:113
+#: ../app/models/katello/ping.rb:105
 msgid "Skipped pulp_auth check after failed pulp check"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:131
+#: ../app/models/katello/ping.rb:123
 msgid "foreman-tasks service not running or is not ready yet"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:137
+#: ../app/models/katello/ping.rb:129
 msgid "some executors are not responding, check %{status_url}"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:144
+#: ../app/models/katello/ping.rb:136
 msgid "Candlepin is not running properly"
 msgstr ""
 
-#: ../app/models/katello/ping.rb:182 ../app/models/katello/ping.rb:201
+#: ../app/models/katello/ping.rb:174 ../app/models/katello/ping.rb:193
 msgid "Pulp does not appear to be running at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:185 ../app/models/katello/ping.rb:204
+#: ../app/models/katello/ping.rb:177 ../app/models/katello/ping.rb:196
 msgid "Pulp database connection issue at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:189
+#: ../app/models/katello/ping.rb:181
 msgid "Pulp message bus connection issue at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:193 ../app/models/katello/ping.rb:215
+#: ../app/models/katello/ping.rb:185 ../app/models/katello/ping.rb:207
 msgid "Not all necessary pulp workers running at %s."
 msgstr ""
 
-#: ../app/models/katello/ping.rb:208
+#: ../app/models/katello/ping.rb:200
 msgid "Pulp redis connection issue at %s."
 msgstr ""
 
@@ -6804,23 +6804,23 @@ msgstr ""
 msgid "Pulp 3 migration cannot run. Types %s have already been migrated."
 msgstr ""
 
-#: ../app/services/katello/registration_manager.rb:144
+#: ../app/services/katello/registration_manager.rb:146
 msgid "Content View and Environment not set for registration."
 msgstr ""
 
-#: ../app/services/katello/registration_manager.rb:237
+#: ../app/services/katello/registration_manager.rb:239
 msgid "Host collection '%{name}' exceeds maximum usage limit of '%{limit}'"
 msgstr ""
 
-#: ../app/services/katello/registration_manager.rb:251
+#: ../app/services/katello/registration_manager.rb:253
 msgid "At least one activation key must have a lifecycle environment and content view assigned to it"
 msgstr ""
 
-#: ../app/services/katello/registration_manager.rb:258
+#: ../app/services/katello/registration_manager.rb:260
 msgid "Attempted to destroy consumer %s from candlepin, but consumer does not exist in candlepin"
 msgstr ""
 
-#: ../app/services/katello/registration_manager.rb:260
+#: ../app/services/katello/registration_manager.rb:262
 msgid "Candlepin consumer %s has already been removed"
 msgstr ""
 
@@ -7192,7 +7192,7 @@ msgid "Synchronize Now"
 msgstr "অবলিম্বে সুসংগত করা হবে"
 
 # translation auto-copied from project Satellite6 Foreman, version 6.0, document foreman
-#: ../app/views/katello/sync_management/index.html.erb:5 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:271 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:147 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:30 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UnsavedChangesDialog.js:15 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js:41
+#: ../app/views/katello/sync_management/index.html.erb:5 ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:274 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:147 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js:30 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UnsavedChangesDialog.js:15 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js:41
 msgid "Cancel"
 msgstr "বাতিল"
 
@@ -7322,15 +7322,15 @@ msgstr ""
 msgid "Clone"
 msgstr "ক্লোন করুন"
 
-#: ../app/views/smart_proxies/_disk_usage.html.erb:7
+#: ../app/views/smart_proxies/_disk_usage.html.erb:8
 msgid "%s Used"
 msgstr ""
 
-#: ../app/views/smart_proxies/_disk_usage.html.erb:8
+#: ../app/views/smart_proxies/_disk_usage.html.erb:9
 msgid "%{used} of %{total}"
 msgstr ""
 
-#: ../app/views/smart_proxies/_disk_usage.html.erb:10 ../app/views/smart_proxies/_disk_usage.html.erb:11
+#: ../app/views/smart_proxies/_disk_usage.html.erb:12 ../app/views/smart_proxies/_disk_usage.html.erb:13
 msgid "%s Available"
 msgstr ""
 
@@ -7599,7 +7599,7 @@ msgstr ""
 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:289 ../webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js:239 ../webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js:185
+#: ../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
 msgid "Loading"
 msgstr ""
 
@@ -8153,71 +8153,71 @@ msgstr ""
 msgid "Disable Red Hat Insights."
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:81
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:84
 msgid "This is disabled because a manifest task is in progress"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:83
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:86
 msgid "This is disabled because no manifest exists"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:118
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:121
 msgid "There is no Manifest History to display."
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:119
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:122
 msgid "Import a Manifest using the manifest tab above."
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:121
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:124
 msgid "Learn more about adding Subscription Manifests"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:127
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:130
 msgid "Updating..."
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:131
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:134
 msgid "No Manifest Uploaded"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:152 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:74
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:155 ../webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js:74
 msgid "Manage Manifest"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:155
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:158
 msgid "Manifest"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:159
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:162
 msgid "Red Hat Provider Details"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:199
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:202
 msgid "Subscription Manifest"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:214
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:217
 msgid "Subscription Allocation"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:226
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:229
 msgid "Import New Manifest"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:248
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:251
 msgid "Refresh"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:267
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:270
 msgid "Confirm delete manifest"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:288
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:291
 msgid "Manifest History"
 msgstr ""
 
-#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:300
+#: ../webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js:303
 msgid "Close"
 msgstr ""
 
@@ -8420,119 +8420,123 @@ msgid "The subscription is no longer available"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Copy version units to library"
+msgid "Sync capsule"
 msgstr ""
 
+# translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
+#: action_names.rb:6
+#, fuzzy
+msgid "Errata mail"
+msgstr "ত্রুটি-বিচ্যুতি ইনস্টলেশন"
+
 #: action_names.rb:7
-msgid "Verify checksum"
+msgid "Incremental Update of  Content View Version(s) "
 msgstr ""
 
-#: action_names.rb:10
-msgid "Update content urls"
+#: action_names.rb:16
+msgid "Promote"
 msgstr ""
 
-#: action_names.rb:13
-msgid "Index package groups"
-msgstr ""
+# translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
+#: action_names.rb:21
+#, fuzzy
+msgid "Auto attach subscriptions"
+msgstr "সংযুক্ত সাবস্ক্রিপশন"
 
-#: action_names.rb:14
-msgid "Instance update"
+#: action_names.rb:26
+msgid "Hypervisors"
 msgstr ""
 
-#: action_names.rb:15
-#, fuzzy
-msgid "Index errata"
-msgstr "ত্রুটি-বিচ্যুতি ইনস্টল করা হচ্ছে..."
+#: action_names.rb:27
+msgid "Hypervisors update"
+msgstr ""
 
-#: action_names.rb:16
-msgid "Index module streams"
+#: action_names.rb:38
+msgid "Reindex subscriptions"
 msgstr ""
 
-#: action_names.rb:17
-msgid "Index content"
+#: action_names.rb:39
+msgid "Update http proxy"
 msgstr ""
 
-#: action_names.rb:18
-msgid "Filtered index content"
+#: action_names.rb:41
+msgid "Discover"
 msgstr ""
 
-# translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
-#: action_names.rb:19
-#, fuzzy
-msgid "Errata mail"
-msgstr "ত্রুটি-বিচ্যুতি ইনস্টলেশন"
+#: action_names.rb:42
+msgid "Fetch pxe files"
+msgstr ""
 
-#: action_names.rb:22
-msgid "Hypervisors update"
+#: action_names.rb:44
+msgid "Filtered index content"
 msgstr ""
 
-#: action_names.rb:23
-msgid "Hypervisors"
+#: action_names.rb:45
+msgid "Index content"
 msgstr ""
 
-# translation auto-copied from project CFSE, version sam-1.2, document app, author Runa Bhattacharjee
-#: action_names.rb:25
+#: action_names.rb:46
 #, fuzzy
-msgid "Auto attach subscriptions"
-msgstr "সংযুক্ত সাবস্ক্রিপশন"
+msgid "Index errata"
+msgstr "ত্রুটি-বিচ্যুতি ইনস্টল করা হচ্ছে..."
 
-#: action_names.rb:37
-msgid "Promote"
+#: action_names.rb:47
+msgid "Index module streams"
 msgstr ""
 
-#: action_names.rb:38
-msgid "Incremental Update of  Content View Version(s) "
+#: action_names.rb:48
+msgid "Index package groups"
 msgstr ""
 
-#: action_names.rb:42
-msgid "Abstract async task"
+#: action_names.rb:49
+msgid "Instance update"
 msgstr ""
 
-#: action_names.rb:43
-#, fuzzy
-msgid "Import facts"
-msgstr "ইম্পোর্ট করুন"
-
-#: action_names.rb:44
-msgid "Update http proxy"
+#: action_names.rb:52
+msgid "Update content urls"
 msgstr ""
 
-#: action_names.rb:45
-msgid "Reindex subscriptions"
+#: action_names.rb:53
+msgid "Update http proxy details"
 msgstr ""
 
 #: action_names.rb:54
-msgid "Discover"
+msgid "Update redhat repository"
 msgstr ""
 
-#: action_names.rb:55
-msgid "Agent action"
+#: action_names.rb:57
+msgid "Verify checksum"
 msgstr ""
 
-#: action_names.rb:59
-msgid "Fetch pxe files"
+#: action_names.rb:62
+msgid "Copy version units to library"
 msgstr ""
 
-#: action_names.rb:60
-msgid "Action with sub plans"
+#: action_names.rb:65
+msgid "Remote action:"
 msgstr ""
 
-#: action_names.rb:61
+#: action_names.rb:66
 msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:67
-msgid "Sync capsule"
+msgid "Action with sub plans"
 msgstr ""
 
-#: action_names.rb:70
-msgid "Update http proxy details"
+#: action_names.rb:68
+msgid "Abstract async task"
 msgstr ""
 
-#: action_names.rb:71
-msgid "Update redhat repository"
+#: action_names.rb:70
+msgid "Agent action"
 msgstr ""
 
+#: action_names.rb:72
+#, fuzzy
+msgid "Import facts"
+msgstr "ইম্পোর্ট করুন"
+
 # translation auto-copied from project CFSE, version sam-1.2, document app
 #~ msgid "Couldn't find GPG key '%s'"
 #~ msgstr "GPG-কি '%s' সন্ধান করা যায়নি"