Merge pull request #250 from jan-cerny/role

Fix terminology

Author: matejak

CMakeLists.txt

@@ -50,7 +50,7 @@ endif()
 option(SCAP_WORKBENCH_LOCAL_SCAN_ENABLED "If enabled, scanning of local machine is possible from workbench. Else the option is disabled in the GUI." TRUE)
 
 if(${OPENSCAP_VERSION_MAJOR} LESS 2 AND ${OPENSCAP_VERSION_MINOR} LESS 3 AND ${OPENSCAP_VERSION_PATCH} LESS 16)  # i.e. oscap<1.2.16
-    message(FATAL_ERROR "Library-powered generation of result-based remediation roles is supported only if you have oscap>=1.2.16, whereas you have oscap==${OPENSCAP_VERSION}")
+    message(FATAL_ERROR "Library-powered generation of result-based remediations is supported only if you have oscap>=1.2.16, whereas you have oscap==${OPENSCAP_VERSION}")
 endif()
 
 find_program(NICE_EXECUTABLE NAMES nice) # fully optional, local scan still available when missing

doc/user_manual.adoc

@@ -380,14 +380,14 @@ to remediate each of them.
 
 The rules that were remediated will show up as *fixed* in the rule result list.
 
-=== Export remediation role for the selected profile
+=== Export remediation for the selected profile
 
-After you select a profile, you can export a remediation role to a file.
-Bash scripts, Ansible playbooks and Puppet manifests are the formats supported.
+After you select a profile, you can export a remediation to a file.
+Bash scripts, Ansible Playbooks and Puppet manifests are the formats supported.
 The output file will contain all remediations for rules selected by the profile
 that are available.
-As the content of the remediation role solely depends on the profile,
-it is referred to as profile-based remediation role.
+As the content of the remediation solely depends on the profile,
+it is referred to as profile-based remediation.
 
 The possibility to save remediations to a file puts you in charge -
 you can examine it, edit it and decide what remediations to apply.
@@ -443,7 +443,7 @@ which will clear all results.
 === View and Analyze Results
 
 After evaluation finishes, you should see three new buttons:
-*Clear*, *Save Results*, *Generate remediation role* and *Show Report*.
+*Clear*, *Save Results*, *Generate remediation* and *Show Report*.
 
 ****
 Pressing Clear will *permanently* destroy scan results! This action cannot
@@ -489,13 +489,13 @@ However, ARF files are not as well supported by SCAP toolchains as XCCDF result
 XCCDF result files can be generated from ARF files, this operation is called *ARF splitting*.
 ****
 
-Opening the *Generate remediation role* pop-up menu will let you to save
+Opening the *Generate remediation* pop-up menu will let you to save
 result-based remediations to a file.
 The output file will contain all available remediations for rules
 that have failed the scan, so it should fit your needs better
 than profile-based remediations.
 As the saved content is based on actual scan results,
-it is referred to as results-based remediation role.
+it is referred to as results-based remediation.
 
 If you scan with a customized profile, you may encounter an error -
 see <<known-issues>> for a workaround.

src/RemediationRoleSaver.cpp

@@ -40,17 +40,17 @@ extern "C"
 
 
 
-const QString bashSaveMessage = QObject::tr("Save remediation role as a bash script");
+const QString bashSaveMessage = QObject::tr("Save remediation as a bash script");
 const QString bashFiletypeExtension = "sh";
 const QString bashFiletypeTemplate = QObject::tr("bash script (*.%1)");
 const QString bashFixTemplate = QString("sh");
 
-const QString ansibleSaveMessage = QObject::tr("Save remediation role as an ansible playbook");
+const QString ansibleSaveMessage = QObject::tr("Save remediation as an ansible playbook");
 const QString ansibleFiletypeExtension = "yml";
 const QString ansibleFiletypeTemplate = QObject::tr("ansible playbook (*.%1)");
 const QString ansibleFixType = QString("ansible");
 
-const QString puppetSaveMessage = QObject::tr("Save remediation role as a puppet manifest");
+const QString puppetSaveMessage = QObject::tr("Save remediation as a puppet manifest");
 const QString puppetFiletypeExtension = "pp";
 const QString puppetFiletypeTemplate = QObject::tr("puppet manifest (*.%1)");
 const QString puppetFixType = QString("puppet");
@@ -108,7 +108,7 @@ void RemediationSaverBase::saveFileOK(const QString& filename)
 void RemediationSaverBase::saveFileError(const QString& filename, const QString& errorMsg)
 {
     removeFileWhenEmpty(filename);
-    const QString completeErrorMessage = QObject::tr("Error generating remediation role '%2': %1").arg(errorMsg, filename);
+    const QString completeErrorMessage = QObject::tr("Error generating remediation '%2': %1").arg(errorMsg, filename);
     mDiagnostics->errorMessage(completeErrorMessage);
 }
 

ui/MainWindow.ui

@@ -360,10 +360,10 @@
              <item>
               <widget class="QPushButton" name="genRemediationButton">
                <property name="toolTip">
-                <string>Generate remediation role that contains fix for every single rule the in the profile. Note that not every rule implements a fix.</string>
+                <string>Generate remediation that contains fix for every single rule the in the profile. Note that not every rule implements a fix.</string>
                </property>
                <property name="text">
-                <string>Generate remediation role</string>
+                <string>Generate remediation</string>
                </property>
               </widget>
              </item>

ui/ResultViewer.ui

@@ -52,10 +52,10 @@
          </font>
         </property>
         <property name="toolTip">
-         <string>Generate remediation role that contains fix for every rule that failed in the scan. However, note that not every rule implements a fix.</string>
+         <string>Generate remediation that contains fix for every rule that failed in the scan. However, note that not every rule implements a fix.</string>
         </property>
         <property name="text">
-         <string>Generate remediation role</string>
+         <string>Generate remediation</string>
         </property>
        </widget>
       </item>