Adding and improvement translated strings

1 files changed, 15 insertions, 15 deletions

diff --git a/lynis b/lynis
index 7ea78b0c..1cd6f9c0 100755
--- a/lynis
+++ b/lynis
@@ -511,7 +511,7 @@ ${NORMAL}
 #
     SafePerms ${INCLUDEDIR}/osdetection
     . ${INCLUDEDIR}/osdetection
-    Display --indent 2 --text "- Detecting OS... " --result DONE --color GREEN
+    Display --indent 2 --text "- Detecting OS... " --result "${STATUS_DONE}" --color GREEN
 
     # Check hostname
     case ${OS} in
@@ -542,7 +542,7 @@ ${NORMAL}
     CDATE=$(date "+%Y-%m-%d %H:%M:%S")
     if [ ${LOGTEXT} -eq 1 ]; then echo "${CDATE} Starting ${PROGRAM_NAME} ${PROGRAM_VERSION} with PID ${OURPID}, build date ${PROGRAM_RELEASE_DATE}" > ${LOGFILE}; fi
     if [ $? -gt 0 ]; then
-        Display --indent 2 --text "- Clearing log file (${LOGFILE})... " --result WARNING --color RED
+        Display --indent 2 --text "- Clearing log file (${LOGFILE})... " --result "${STATUS_WARNING}" --color RED
         echo "${WARNING}Fatal error${NORMAL}: problem while writing to log file. Check location and permissions."
         RemovePIDFile
         exit 1
@@ -728,7 +728,7 @@ ${NORMAL}
     fi
 
     if [ -z "${PROGRAM_AC}" -o -z "${PROGRAM_LV}" ]; then
-        Display --indent 2 --text "- Program update status... " --result UNKNOWN --color YELLOW
+        Display --indent 2 --text "- Program update status... " --result "${STATUS_UNKNOWN}" --color YELLOW
         LogText "Result: Update check failed. No network connection?"
         LogText "Info: to perform an automatic update check, outbound DNS connections should be allowed (TXT record)."
         # Set both to safe values
@@ -741,13 +741,13 @@ ${NORMAL}
             PROGRAM_MINVERSION=$((PROGRAM_LV - 10))
             LogText "Minimum required version   : ${PROGRAM_MINVERSION}"
             if [ ${PROGRAM_MINVERSION} -gt ${PROGRAM_AC} ]; then
-                Display --indent 2 --text "- Program update status... " --result "WARNING" --color RED
+                Display --indent 2 --text "- Program update status... " --result "${STATUS_WARNING}" --color RED
                 LogText "Result: This version is VERY outdated. Newer ${PROGRAM_NAME} release available!"
                 ReportWarning "LYNIS" "Version of Lynis is very old and should be updated"
                 Report "lynis_update_available=1"
                 UPDATE_AVAILABLE=1
             else
-                Display --indent 2 --text "- Program update status... " --result "UPDATE AVAILABLE" --color YELLOW
+                Display --indent 2 --text "- Program update status... " --result "${STATUS_UPDATE_AVAILABLE}" --color YELLOW
                 LogText "Result: newer ${PROGRAM_NAME} release available!"
                 ReportSuggestion "LYNIS" "Version of Lynis outdated, consider upgrading to the latest version"
                 Report "lynis_update_available=1"
@@ -755,11 +755,11 @@ ${NORMAL}
             fi
         else
             if [ ${UPDATE_CHECK_SKIPPED} -eq 0 ]; then
-                Display --indent 2 --text "- Program update status... " --result "NO UPDATE" --color GREEN
+                Display --indent 2 --text "- Program update status... " --result "${STATUS_NO_UPDATE}" --color GREEN
                 LogText "No ${PROGRAM_NAME} update available."
                 Report "lynis_update_available=0"
             else
-                Display --indent 2 --text "- Program update status... " --result "SKIPPED" --color YELLOW
+                Display --indent 2 --text "- Program update status... " --result "${STATUS_SKIPPED}" --color YELLOW
                 LogText "Update check skipped due to constraints (e.g. missing dig binary)"
                 Report "lynis_update_available=-1"
             fi
@@ -863,11 +863,11 @@ ${NORMAL}
 #
     if IsVerbose; then
         InsertSection "${SECTION_PROGRAM_DETAILS}"
-        Display --indent 2 --text "- ${GEN_VERBOSE_MODE}" --result "YES" --color GREEN
+        Display --indent 2 --text "- ${GEN_VERBOSE_MODE}" --result "${STATUS_YES}" --color GREEN
         if IsDebug; then
-            Display --indent 2 --text "- ${GEN_DEBUG_MODE}" --result "YES" --color GREEN
+            Display --indent 2 --text "- ${GEN_DEBUG_MODE}" --result "${STATUS_YES}" --color GREEN
         else
-            Display --indent 2 --text "- ${GEN_DEBUG_MODE}" --result "NO" --color RED
+            Display --indent 2 --text "- ${GEN_DEBUG_MODE}" --result "${STATUS_NO}" --color RED
         fi
     fi
 #
@@ -957,7 +957,7 @@ ${NORMAL}
         RunPlugins 1
 
         if [ ${N_PLUGIN_ENABLED} -eq 0 ]; then
-            Display --indent 2 --text "- ${GEN_PLUGINS_ENABLED}" --result "NONE" --color WHITE
+            Display --indent 2 --text "- ${GEN_PLUGINS_ENABLED}" --result "${STATUS_NONE}" --color WHITE
             Report "plugins_enabled=0"
         else
             Report "plugins_enabled=1"
@@ -1018,7 +1018,7 @@ ${NORMAL}
                     ReportWarning "NONE" "Invalid permissions on tests file tests_${INCLUDE_TEST}"
                     # Insert a section and warn user also on screen
                     InsertSection "${SECTION_GENERAL}"
-                    Display --indent 2 --text "- Running test category ${INCLUDE_TEST}... " --result "SKIPPED" --color RED
+                    Display --indent 2 --text "- Running test category ${INCLUDE_TEST}... " --result "${STATUS_SKIPPED}" --color RED
                 fi
             else
                 echo "Error: Can't find file (category: ${INCLUDE_TEST})"
@@ -1043,10 +1043,10 @@ ${NORMAL}
             else
                 LogText "Exception: skipping custom tests, file has bad permissions (should be 640, 600 or 400)"
                 ReportWarning "NONE" "Invalid permissions on custom tests file"
-                Display --indent 2 --text "- Running custom tests... " --result "WARNING" --color RED
+                Display --indent 2 --text "- Running custom tests... " --result "${STATUS_WARNING}" --color RED
             fi
         else
-            Display --indent 2 --text "- Running custom tests... " --result "NONE" --color WHITE
+            Display --indent 2 --text "- Running custom tests... " --result "${STATUS_NONE}" --color WHITE
         fi
     fi
 #
@@ -1079,7 +1079,7 @@ ${NORMAL}
     if [ ${SKIP_PLUGINS} -eq 0 ]; then
         RunPlugins 2
         if [ ${N_PLUGIN_ENABLED} -gt 1 ]; then
-            Display --indent 2 --text "- Plugins (phase 2)" --result "DONE" --color GREEN
+            Display --indent 2 --text "- Plugins (phase 2)" --result "${STATUS_DONE}" --color GREEN
         fi
     fi
 #