foreman_openscap 10.0.3 → 10.2.0

data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -94,7 +94,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -92,8 +92,8 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         "默认情况下，补救会应用到当前主机。（可选）修复任何规则失败的额外主机。"
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
-        "无法找到 scap-security-guide RPM，您确定是否已安装在服务器上？"
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
+        ""
       ],
       "Cancel": [
         "取消"

data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_openscap": {
       "": {
-        "Project-Id-Version": "foreman_openscap 10.0.1",
+        "Project-Id-Version": "foreman_openscap 10.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-04-14 07:48+0000",
         "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
@@ -93,7 +93,7 @@
       "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule.": [
         ""
       ],
-      "Can't find scap-security-guide RPM, are you sure it is installed on your server?": [
+      "Can't find %{packages} RPM(s), are you sure it is installed on your server?": [
         ""
       ],
       "Cancel": [

data/app/assets/javascripts/foreman_openscap/policy_edit.js

@@ -30,7 +30,7 @@ function tailoring_file_selected(element) {
 
 function previous_step(previous) {
   $('#policy_current_step').val(previous);
-  $('#new_policy').submit();
+  $('#new_policy').trigger("submit");
 }
 
 function period_selected(period) {

data/app/assets/javascripts/foreman_openscap/reports.js

@@ -7,5 +7,5 @@ function showReportDetails(log_id, event) {
 function showRemediationWizard(log_id) {
   var wizard_button = $('#openscapRemediationWizardButton');
   wizard_button.attr('data-log-id', log_id);
-  wizard_button.click();
+  wizard_button.trigger("click");
 }

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -1,5 +1,3 @@
-require 'foreman_openscap/bulk_upload'
-
 module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController

data/app/controllers/arf_reports_controller.rb

@@ -10,9 +10,15 @@ class ArfReportsController < ApplicationController
   end
 
   def index
+    # Avoid using includes() with nested associations and "order by" together. Otherwise,
+    # includes() will use join tables instead and Rails somehow create many objects and
+    # high memory consumption.
+    @arf_reports_pg = resource_base.search_for(params[:search], :order => params[:order])
+                                   .paginate(:page => params[:page], :per_page => params[:per_page])
+    arf_report_ids = @arf_reports_pg.pluck(:id)
     @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
-                                .search_for(params[:search], :order => params[:order])
-                                .paginate(:page => params[:page], :per_page => params[:per_page])
+                                .where(id: arf_report_ids)
+                                .sort_by { |arf_report| arf_report_ids.index(arf_report.id) }
   end
 
   def show

data/app/models/concerns/foreman_openscap/scap_file_content.rb

@@ -8,7 +8,7 @@ module ForemanOpenscap
       validates :digest, :presence => true
       validates :scap_file, :presence => true
 
-      before_validation :redigest, :if => lambda { |file_content| file_content.persisted? && file_content.scap_file_changed? }
+      before_validation :redigest, :if => lambda { |file_content| !file_content.persisted? || file_content.scap_file_changed? }
     end
 
     def digest

data/{lib → app/services}/foreman_openscap/bulk_upload.rb

@@ -7,21 +7,28 @@ module ForemanOpenscap
       @result = OpenStruct.new(:errors => [], :results => [])
     end
 
-    def files_from_guide
-      `rpm -ql scap-security-guide | grep ds.xml`.split
+    def security_guide_packages
+      %w(scap-security-guide)
     end
 
-    def scap_guide_installed?
-      `rpm -qa | grep scap-security-guide`.present?
+    def files_from_guide(package)
+      `rpm -ql #{package} | grep ds.xml`.split
+    end
+
+    def package_installed?(package)
+      `rpm -qa | grep #{package}`.present?
     end
 
     def upload_from_scap_guide
-      unless scap_guide_installed?
-        @result.errors.push(_("Can't find scap-security-guide RPM, are you sure it is installed on your server?"))
+      package = security_guide_packages.find { |p| package_installed? p }
+      unless package
+        joined_packages = security_guide_packages.join(', ')
+        msg = _("Can't find %{packages} RPM(s), are you sure it is installed on your server?")
+        @result.errors.push(msg % {packages: joined_packages})
         return @result
       end
 
-      upload_from_files(files_from_guide, true)
+      upload_from_files(files_from_guide(package), true)
     end
 
     def upload_from_files(files_array, from_scap_guide = false)
@@ -41,12 +48,11 @@ module ForemanOpenscap
           next
         end
 
-        file = File.open(datastream, 'rb').read
-        digest = Digest::SHA2.hexdigest(datastream)
+        file = File.read(datastream, mode: 'rb')
         title = content_name(datastream, from_scap_guide)
         filename = original_filename(datastream)
-        scap_content = ScapContent.where(:title => title, :digest => digest).first_or_initialize
-        next if scap_content.persisted?
+
+        scap_content = ScapContent.where(:title => title).first_or_initialize
         scap_content.scap_file = file
         scap_content.original_filename = filename
         scap_content.location_ids = Location.all.pluck(:id)

data/app/views/arf_reports/_list.html.erb

@@ -56,4 +56,4 @@
     </div>
   </div>
 </div>
-<%= will_paginate_with_info @arf_reports %>
+<%= will_paginate_with_info @arf_reports_pg %>

data/lib/foreman_openscap/engine.rb

@@ -40,7 +40,7 @@ module ForemanOpenscap
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_openscap do
-          requires_foreman '>= 3.13'
+          requires_foreman '>= 3.14'
           register_gettext
 
           apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "10.0.3".freeze
+  VERSION = "10.2.0".freeze
 end

data/lib/tasks/foreman_openscap_tasks.rake

@@ -1,6 +1,5 @@
 # Tasks
 namespace :foreman_openscap do
-  require 'foreman_openscap/bulk_upload'
   require 'foreman_openscap/message_cleaner'
 
   namespace :bulk_upload do

data/locale/cs_CZ/foreman_openscap.po

@@ -6,7 +6,7 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020\n"
@@ -96,7 +96,7 @@ msgstr "Zpět"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/de/foreman_openscap.po

@@ -10,7 +10,7 @@
 # pdolinic, 2021
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: pdolinic, 2021\n"
@@ -98,7 +98,7 @@ msgstr "Zurück"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/en/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2023-05-16 14:11+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -94,7 +94,7 @@ msgstr ""
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/en_GB/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -94,7 +94,7 @@ msgstr "Back"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/es/foreman_openscap.po

@@ -7,7 +7,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
@@ -98,7 +98,7 @@ msgstr "Atrás"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/foreman_openscap.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_openscap 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-29 14:04+0000\n"
-"PO-Revision-Date: 2024-10-29 14:04+0000\n"
+"POT-Creation-Date: 2024-12-03 14:01+0000\n"
+"PO-Revision-Date: 2024-12-03 14:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -148,60 +148,60 @@ msgstr ""
 msgid "List SCAP content profiles"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:16
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:14
 msgid "List SCAP contents"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:24
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:22
 msgid "Download an SCAP content as XML"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:33
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:31
 msgid "Show an SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:40
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:38
 msgid "SCAP content name"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:41
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:39
 msgid "XML containing SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:42
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:40
 #: ../app/controllers/api/v2/compliance/tailoring_files_controller.rb:36
 msgid "Original file name of the XML file"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:47
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:45
 msgid "Create SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:55
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:53
 msgid "Update an SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:63
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:61
 msgid "Deletes an SCAP content"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:70
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:68
 msgid "Upload scap contents in bulk"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:71
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:69
 msgid "Type of the upload"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:72
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:70
 msgid "File paths to upload when using \"files\" upload type"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:73
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:71
 msgid "Directory to upload when using \"directory\" upload type"
 msgstr ""
 
-#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:86
+#: ../app/controllers/api/v2/compliance/scap_contents_controller.rb:84
 msgid ""
 "Please specify import type, received: %{received}, expected one of: %{expected"
 "}"
@@ -239,39 +239,39 @@ msgstr ""
 msgid "Deletes a Tailoring file"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:37
+#: ../app/controllers/arf_reports_controller.rb:43
 msgid "Failed to downloaded ARF report as bzip: %s"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:48
+#: ../app/controllers/arf_reports_controller.rb:54
 msgid "Failed to downloaded ARF report in HTML: %s"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:55
+#: ../app/controllers/arf_reports_controller.rb:61
 msgid "Successfully deleted ARF report."
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:57
+#: ../app/controllers/arf_reports_controller.rb:63
 msgid "Failed to delete ARF Report for host %{host_name} reported at %{reported_at}"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:67
+#: ../app/controllers/arf_reports_controller.rb:73
 msgid "Failed to delete %s compliance reports"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:70
+#: ../app/controllers/arf_reports_controller.rb:76
 msgid "Successfully deleted %s compliance reports"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:106
+#: ../app/controllers/arf_reports_controller.rb:112
 msgid "No compliance reports were found."
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:110
+#: ../app/controllers/arf_reports_controller.rb:116
 msgid "No compliance reports selected"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:115
+#: ../app/controllers/arf_reports_controller.rb:121
 msgid "Something went wrong while selecting compliance reports - %s"
 msgstr ""
 
@@ -703,6 +703,38 @@ msgstr ""
 msgid "invalid type %s"
 msgstr ""
 
+#: ../app/services/foreman_openscap/bulk_upload.rb:26
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:36
+msgid "Expected an array of files to upload, got: %s."
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:42
+msgid "%s is a directory, expecting file."
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:47
+msgid "%s does not exist, skipping."
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:65
+msgid "Failed saving %s:"
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:73
+msgid "No such directory: %s. Please check the path you have provided."
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:95
+msgid "Red Hat %s default content"
+msgstr ""
+
+#: ../app/services/foreman_openscap/bulk_upload.rb:95
+msgid "%s content"
+msgstr ""
+
 #: ../app/services/foreman_openscap/client_config/ansible.rb:23
 msgid ""
 "Requires Ansible plugin, %s Ansible role and variables. This will assign the r"
@@ -761,19 +793,19 @@ msgid ""
 ". Are you missing a plugin?"
 msgstr ""
 
-#: ../app/services/foreman_openscap/lookup_key_overrider.rb:26
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:27
 msgid ""
 "Required %{msg_name} %{class} was not found, please ensure it is imported firs"
 "t."
 msgstr ""
 
-#: ../app/services/foreman_openscap/lookup_key_overrider.rb:34
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:35
 msgid ""
 "The following %{key_name} were missing for %{item_name}: %{key_names}. Make su"
 "re they are imported before proceeding."
 msgstr ""
 
-#: ../app/services/foreman_openscap/lookup_key_overrider.rb:56
+#: ../app/services/foreman_openscap/lookup_key_overrider.rb:57
 msgid "Failed to save when overriding parameters for %{config_tool}, cause: %{errors}"
 msgstr ""
 
@@ -1346,40 +1378,6 @@ msgstr ""
 msgid "A summary of reports for OpenSCAP policies"
 msgstr ""
 
-#: ../lib/foreman_openscap/bulk_upload.rb:20
-msgid ""
-"Can't find scap-security-guide RPM, are you sure it is installed on your serve"
-"r?"
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:29
-msgid "Expected an array of files to upload, got: %s."
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:35
-msgid "%s is a directory, expecting file."
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:40
-msgid "%s does not exist, skipping."
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:58
-msgid "Failed saving %s:"
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:66
-msgid "No such directory: %s. Please check the path you have provided."
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:88
-msgid "Red Hat %s default content"
-msgstr ""
-
-#: ../lib/foreman_openscap/bulk_upload.rb:88
-msgid "%s content"
-msgstr ""
-
 #: ../lib/foreman_openscap/engine.rb:133
 msgid "Policies"
 msgstr ""

data/locale/fr/foreman_openscap.po

@@ -8,7 +8,7 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016\n"
@@ -98,8 +98,8 @@ msgstr "Précédent"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr "Par défaut, la correction est appliquée à l'hôte actuel. Vous pouvez éventuellement corriger tous les hôtes supplémentaires qui ne respectent pas la règle."
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
-msgstr "Vous ne trouvez pas le RPM scap-security-guide, êtes-vous sûr qu'il est installé sur votre serveur ?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
+msgstr ""
 
 msgid "Cancel"
 msgstr "Annuler"

data/locale/gl/foreman_openscap.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -94,7 +94,7 @@ msgstr "Atrás"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"

data/locale/it/foreman_openscap.po

@@ -6,7 +6,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 10.0.1\n"
+"Project-Id-Version: foreman_openscap 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-04-14 07:48+0000\n"
 "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
@@ -96,7 +96,7 @@ msgstr "Indietro"
 msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
 msgstr ""
 
-msgid "Can't find scap-security-guide RPM, are you sure it is installed on your server?"
+msgid "Can't find %{packages} RPM(s), are you sure it is installed on your server?"
 msgstr ""
 
 msgid "Cancel"