diff --git a/db/languages/de b/db/languages/de
index ef6711c8..5d3f5be1 100644
--- a/db/languages/de
+++ b/db/languages/de
@@ -14,21 +14,67 @@ NOTE_EXCEPTIONS_FOUND="Abweichungen gefunden"
 NOTE_EXCEPTIONS_FOUND_DETAILED="Einige außergewöhnliche Ereignisse oder Informationen wurden gefunden"
 NOTE_PLUGINS_TAKE_TIME="Beachte: Plugins beinhalten eingehendere Tests und können mehrere Minuten benötigen, bis sie abgeschlossen sind"
 NOTE_SKIPPED_TESTS_NON_PRIVILEGED="Übersprungene Tests aufgrund nicht privilegiertem Modus"
+SECTION_ACCOUNTING="Accounting"
+SECTION_BANNERS_AND_IDENTIFICATION="Banner und Identifizierung"
+SECTION_BASICS="Grundlegendes"
+SECTION_BOOT_AND_SERVICES="Systemstart und Dienste"
+SECTION_CONTAINERS="Container"
+SECTION_CRYPTOGRAPHY="Kryptographie"
 SECTION_CUSTOM_TESTS="Benutzerdefinierte Tests"
 SECTION_DATA_UPLOAD="Daten hochladen"
+SECTION_DATABASES="Datenbanken"
+SECTION_DOWNLOADS="Downloads"
+SECTION_EMAIL_AND_MESSAGING="Software: E-Mail und Messaging"
+SECTION_FILE_INTEGRITY="Software: Dateintegrität"
+SECTION_FILE_PERMISSIONS="Dateiberechtigungen"
+SECTION_FILE_SYSTEMS="Dateisysteme"
+SECTION_FIREWALLS="Software: Firewalls"
+SECTION_GENERAL="Allgemein"
+SECTION_HARDENING="Härtung"
+SECTION_HOME_DIRECTORIES="Heimatverzeichnisse"
+SECTION_IMAGE="Image"
 SECTION_INITIALIZING_PROGRAM="Initialisiere Programm"
-SECTION_MALWARE="Malware"
-SECTION_MEMORY_AND_PROCESSES="Speicher und Prozesse"
+SECTION_INSECURE_SERVICES="Unsichere Dienste"
+SECTION_KERNEL="Kernel"
+SECTION_KERNEL_HARDENING="Kernelhärtung"
+SECTION_LDAP_SERVICES="LDAP Dienste"
+SECTION_LOGGING_AND_FILES="Logs und Logdateien"
+SECTION_MALWARE="Software: Malware"
+SECTION_MEMORY_AND_PROCESSES="Software: Speicher und Prozesse"
+SECTION_NAME_SERVICES="Namensauflösung"
+SECTION_NETWORKING="Netzwerk"
+SECTION_PERMISSIONS="Berechtigungen"
+SECTION_PORTS_AND_PACKAGES="Ports und Pakete"
+SECTION_PRINTERS_AND_SPOOLS="Drucker und Warteschlange"
+SECTION_PROGRAM_DETAILS="Programmdetails"
+SECTION_SCHEDULED_TASKS="Geplante Aufgaben"
+SECTION_SECURITY_FRAMEWORKS="Sicherheitsframeworks"
+SECTION_SHELLS="Shells"
+SECTION_SNMP_SUPPORT="SNMP Unterstützung"
+SECTION_SOFTWARE="Software"
+SECTION_SQUID_SUPPORT="Squid"
+SECTION_SSH_SUPPORT="SSH"
+SECTION_STORAGE="Speicher"
+SECTION_SYSTEM_INTEGRITY="Software: Systemintegrität"
+SECTION_SYSTEM_TOOLING="Software: Systemwerkzeuge"
 SECTION_SYSTEM_TOOLS="Systemwerkzeuge"
+SECTION_TIME_AND_SYNCHRONIZATION="Zeit und Zeitsynchronisierung"
+SECTION_USB_DEVICES="USB Geräte"
+SECTION_USERS_GROUPS_AND_AUTHENTICATION="Benutzer, Gruppen und Authentifizierung"
+SECTION_VIRTUALIZATION="Virtualisierung"
+SECTION_WEBSERVER="Software: Webserver"
+STATUS_ACTIVE="AKTIV"
 STATUS_DISABLED="DEAKTIVIERT"
 STATUS_DONE="FERTIG"
 STATUS_ENABLED="AKTIVIERT"
 STATUS_ERROR="FEHLER"
 STATUS_FAILED="FEHLERHAFT"
 STATUS_FOUND="GEFUNDEN"
+STATUS_INSTALLED="INSTALLIERT"
 STATUS_NO="NEIN"
 STATUS_NONE="NICHTS"
 STATUS_NOT_CONFIGURED="NICHT KONFIGURIERT"
+STATUS_NOT_ENABLED="NICHT AKTIVIERT"
 STATUS_NOT_FOUND="NICHT GEFUNDEN"
 STATUS_NOT_RUNNING="LÄUFT NICHT"
 STATUS_OFF="AUS"
diff --git a/db/languages/en b/db/languages/en
index 7ab20590..b5cbef6a 100644
--- a/db/languages/en
+++ b/db/languages/en
@@ -63,15 +63,18 @@ SECTION_USB_DEVICES="USB Devices"
 SECTION_USERS_GROUPS_AND_AUTHENTICATION="Users, Groups and Authentication"
 SECTION_VIRTUALIZATION="Virtualization"
 SECTION_WEBSERVER="Software: webserver"
+STATUS_ACTIVE="ACTIVE"
 STATUS_DISABLED="DISABLED"
 STATUS_DONE="DONE"
 STATUS_ENABLED="ENABLED"
 STATUS_ERROR="ERROR"
 STATUS_FAILED="FAILED"
 STATUS_FOUND="FOUND"
+STATUS_INSTALLED="INSTALLED"
 STATUS_NO="NO"
 STATUS_NONE="NONE"
 STATUS_NOT_CONFIGURED="NOT CONFIGURED"
+STATUS_NOT_ENABLED="NOT ENABLED"
 STATUS_NOT_FOUND="NOT FOUND"
 STATUS_NOT_RUNNING="NOT RUNNING"
 STATUS_OFF="OFF"
diff --git a/include/tests_authentication b/include/tests_authentication
index b27e59c7..ce2205ca 100644
--- a/include/tests_authentication
+++ b/include/tests_authentication
@@ -502,7 +502,7 @@
             FIND=$(${EGREPBINARY} "^passwd" /etc/nsswitch.conf | ${EGREPBINARY} "compat|nisplus")
             if [ -z "${FIND}" ]; then
                 LogText "Result: NIS+ authentication not enabled"
-                Display --indent 2 --text "- NIS+ authentication support" --result "NOT ENABLED" --color WHITE
+                Display --indent 2 --text "- NIS+ authentication support" --result "${STATUS_NOT_ENABLED}" --color WHITE
             else
                 FIND2=$(${EGREPBINARY} "^passwd_compat" ${ROOTDIR}etc/nsswitch.conf | ${GREPBINARY} "nisplus")
                 FIND3=$(${EGREPBINARY} "^passwd" ${ROOTDIR}etc/nsswitch.conf | ${GREPBINARY} "nisplus")
@@ -511,7 +511,7 @@
                     Display --indent 2 --text "- NIS+ authentication support" --result "${STATUS_ENABLED}" --color GREEN
                 else
                     LogText "Result: NIS+ authentication not enabled"
-                    Display --indent 2 --text "- NIS+ authentication support" --result "NOT ENABLED" --color WHITE
+                    Display --indent 2 --text "- NIS+ authentication support" --result "${STATUS_NOT_ENABLED}" --color WHITE
                 fi
             fi
           else
@@ -529,7 +529,7 @@
             FIND=$(${EGREPBINARY} "^passwd" /etc/nsswitch.conf | ${EGREPBINARY} "compat|nis" | ${GREPBINARY} -v "nisplus")
             if [ -z "${FIND}" ]; then
                 LogText "Result: NIS authentication not enabled"
-                Display --indent 2 --text "- NIS authentication support" --result "NOT ENABLED" --color WHITE
+                Display --indent 2 --text "- NIS authentication support" --result "${STATUS_NOT_ENABLED}" --color WHITE
             else
                 FIND2=$(${EGREPBINARY} "^passwd_compat" /etc/nsswitch.conf | ${GREPBINARY} "nis" | ${GREPBINARY} -v "nisplus")
                 FIND3=$(${EGREPBINARY} "^passwd" /etc/nsswitch.conf | ${GREPBINARY} "nis" | ${GREPBINARY} -v "nisplus")
@@ -538,7 +538,7 @@
                     Display --indent 2 --text "- NIS authentication support" --result "${STATUS_ENABLED}" --color GREEN
                 else
                     LogText "Result: NIS authentication not enabled"
-                    Display --indent 2 --text "- NIS authentication support" --result "NOT ENABLED" --color WHITE
+                    Display --indent 2 --text "- NIS authentication support" --result "${STATUS_NOT_ENABLED}" --color WHITE
                 fi
             fi
         else
@@ -1475,7 +1475,7 @@
         if [ ${FOUND} -eq 1 ]; then
             Display --indent 2 --text "- Checking account locking" --result "${STATUS_ENABLED}" --color GREEN
         else
-            Display --indent 2 --text "- Checking account locking" --result "NOT ENABLED" --color YELLOW
+            Display --indent 2 --text "- Checking account locking" --result "${STATUS_NOT_ENABLED}" --color YELLOW
         fi
     fi
 #
@@ -1489,7 +1489,7 @@
             FIND=$(${EGREPBINARY} "^passwd" ${ROOTDIR}etc/nsswitch.conf | ${GREPBINARY} "ldap")
             if [ "${FIND}" = "" ]; then
                 LogText "Result: LDAP authentication not enabled"
-                Display --indent 2 --text "- LDAP authentication support" --result "NOT ENABLED" --color WHITE
+                Display --indent 2 --text "- LDAP authentication support" --result "${STATUS_NOT_ENABLED}" --color WHITE
             else
                 LogText "Result: LDAP authentication enabled"
                 Display --indent 2 --text "- LDAP authentication support" --result "${STATUS_ENABLED}" --color GREEN
diff --git a/include/tests_firewalls b/include/tests_firewalls
index 4d0ba748..685f2452 100644
--- a/include/tests_firewalls
+++ b/include/tests_firewalls
@@ -539,7 +539,7 @@
     Register --test-no FIRE-4590 --weight L --network NO --category security --description "Check firewall status"
     if [ ${SKIPTEST} -eq 0 ]; then
         if [ ${FIREWALL_ACTIVE} -eq 1 ]; then
-            Display --indent 2 --text "- Checking host based firewall" --result "ACTIVE" --color GREEN
+            Display --indent 2 --text "- Checking host based firewall" --result "${STATUS_ACTIVE}" --color GREEN
             LogText "Result: host based firewall or packet filter is active"
             Report "manual[]=Verify if there is a formal process for testing and applying firewall rules"
             Report "manual[]=Verify all traffic is filtered the right way between the different security zones"
@@ -548,7 +548,7 @@
             Report "manual[]=Make sure an explicit deny all is the default policy for all unmatched traffic"
             AddHP 5 5
         else
-            Display --indent 2 --text "- Checking host based firewall" --result "NOT ACTIVE" --color YELLOW
+            Display --indent 2 --text "- Checking host based firewall" --result "${STATUS_NOT_ACTIVE}" --color YELLOW
             LogText "Result: no host based firewall/packet filter found or configured"
             ReportSuggestion "${TEST_NO}" "Configure a firewall/packet filter to filter incoming and outgoing traffic"
             AddHP 0 5
diff --git a/include/tests_insecure_services b/include/tests_insecure_services
index 230d117e..2ba308b3 100644
--- a/include/tests_insecure_services
+++ b/include/tests_insecure_services
@@ -63,11 +63,11 @@
         LogText "Test: Searching for active inet daemon"
         if IsRunning "inetd"; then
             LogText "Result: inetd is running"
-            Display --indent 4 --text "- inetd status" --result "ACTIVE" --color GREEN
+            Display --indent 4 --text "- inetd status" --result "${STATUS_ACTIVE}" --color GREEN
             INETD_ACTIVE=1
         else
             LogText "Result: inetd is NOT running"
-            Display --indent 4 --text "- inetd status" --result "NOT ACTIVE" --color GREEN
+            Display --indent 4 --text "- inetd status" --result "${STATUS_NOT_ACTIVE}" --color GREEN
         fi
     fi
 #
@@ -158,11 +158,11 @@
         LogText "Test: Searching for active extended internet services daemon (xinetd)"
         if IsRunning "xinetd"; then
             LogText "Result: xinetd is running"
-            Display --indent 4 --text "- xinetd status" --result "ACTIVE" --color GREEN
+            Display --indent 4 --text "- xinetd status" --result "${STATUS_ACTIVE}" --color GREEN
             XINETD_ACTIVE=1
         else
             LogText "Result: xinetd is NOT running"
-            Display --indent 4 --text "- xinetd status" --result "NOT ACTIVE" --color GREEN
+            Display --indent 4 --text "- xinetd status" --result "${STATUS_NOT_ACTIVE}" --color GREEN
         fi
     fi
 #
diff --git a/include/tests_networking b/include/tests_networking
index 9e63088b..9bf5a082 100644
--- a/include/tests_networking
+++ b/include/tests_networking
@@ -683,7 +683,7 @@
             Display --indent 2 --text "- Checking status DHCP client" --result "${STATUS_RUNNING}" --color WHITE
             DHCP_CLIENT_RUNNING=1
         else
-            Display --indent 2 --text "- Checking status DHCP client" --result "NOT ACTIVE" --color WHITE
+            Display --indent 2 --text "- Checking status DHCP client" --result "${STATUS_NOT_ACTIVE}" --color WHITE
         fi
     fi
 #
diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index c2978be6..2e827813 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -1232,7 +1232,7 @@
             ReportSuggestion "${TEST_NO}" "Install a package audit tool to determine vulnerable packages"
             LogText "Result: no package audit tool found"
         else
-            Display --indent 2 --text "- Checking package audit tool" --result INSTALLED --color GREEN
+            Display --indent 2 --text "- Checking package audit tool" --result "${STATUS_INSTALLED}" --color GREEN
             Display --indent 4 --text "Found: ${PACKAGE_AUDIT_TOOL}"
             LogText "Result: found package audit tool: ${PACKAGE_AUDIT_TOOL}"
         fi