diff --git a/src/Controller/ToolsController.php b/src/Controller/ToolsController.php
index 78e149e3..dbcb91a1 100644
--- a/src/Controller/ToolsController.php
+++ b/src/Controller/ToolsController.php
@@ -61,10 +61,10 @@ class ToolsController extends AbstractController
             'default_theme' => $this->getParameter('partdb.global_theme'),
             'enabled_locales' => $this->getParameter('partdb.locale_menu'),
             'demo_mode' => $this->getParameter('partdb.demo_mode'),
-            'gpdr_compliance' => $this->getParameter('partdb.gdpr_compliance'),
+            'gdpr_compliance' => $this->getParameter('partdb.gdpr_compliance'),
             'use_gravatar' => $this->getParameter('partdb.users.use_gravatar'),
             'email_password_reset' => $this->getParameter('partdb.users.email_pw_reset'),
-            'enviroment' => $this->getParameter('kernel.environment'),
+            'environment' => $this->getParameter('kernel.environment'),
             'is_debug' => $this->getParameter('kernel.debug'),
             'email_sender' => $this->getParameter('partdb.mail.sender_email'),
             'email_sender_name' => $this->getParameter('partdb.mail.sender_name'),
diff --git a/src/Entity/LogSystem/SecurityEventLogEntry.php b/src/Entity/LogSystem/SecurityEventLogEntry.php
index ffcfd6a5..1b65ca0b 100644
--- a/src/Entity/LogSystem/SecurityEventLogEntry.php
+++ b/src/Entity/LogSystem/SecurityEventLogEntry.php
@@ -127,7 +127,7 @@ class SecurityEventLogEntry extends AbstractLogEntry
      * Sets the IP address used to log in the user.
      *
      * @param string $ip        the IP address used to log in the user
-     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GPDR compliant
+     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GDPR compliant
      *
      * @return $this
      */
diff --git a/src/Entity/LogSystem/UserLoginLogEntry.php b/src/Entity/LogSystem/UserLoginLogEntry.php
index c9e6bc21..db62eb01 100644
--- a/src/Entity/LogSystem/UserLoginLogEntry.php
+++ b/src/Entity/LogSystem/UserLoginLogEntry.php
@@ -52,7 +52,7 @@ class UserLoginLogEntry extends AbstractLogEntry
      * Sets the IP address used to log in the user.
      *
      * @param string $ip        the IP address used to log in the user
-     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GPDR compliant
+     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GDPR compliant
      *
      * @return $this
      */
diff --git a/src/Entity/LogSystem/UserLogoutLogEntry.php b/src/Entity/LogSystem/UserLogoutLogEntry.php
index ba52de87..275b1d4e 100644
--- a/src/Entity/LogSystem/UserLogoutLogEntry.php
+++ b/src/Entity/LogSystem/UserLogoutLogEntry.php
@@ -49,7 +49,7 @@ class UserLogoutLogEntry extends AbstractLogEntry
      * Sets the IP address used to log in the user.
      *
      * @param string $ip        the IP address used to log in the user
-     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GPDR compliant
+     * @param bool   $anonymize Anonymize the IP address (remove last block) to be GDPR compliant
      *
      * @return $this
      */
diff --git a/templates/tools/server_infos/_partdb.html.twig b/templates/tools/server_infos/_partdb.html.twig
index 52d19c93..ca2b82a8 100644
--- a/templates/tools/server_infos/_partdb.html.twig
+++ b/templates/tools/server_infos/_partdb.html.twig
@@ -11,7 +11,7 @@
     </tr>
     <tr>
         <td>Symfony environment</td>
-        <td>{{ enviroment }} (Debug: {{ helper.boolean_badge(is_debug) }})</td>
+        <td>{{ environment }} (Debug: {{ helper.boolean_badge(is_debug) }})</td>
     </tr>
     <tr>
         <td>Part-DB Instance name</td>
@@ -42,8 +42,8 @@
         <td>{{ helper.boolean_badge(demo_mode) }}</td>
     </tr>
     <tr>
-        <td>GPDR Compliance Mode</td>
-        <td>{{ helper.boolean_badge(gpdr_compliance) }}</td>
+        <td>GDPR Compliance Mode</td>
+        <td>{{ helper.boolean_badge(gdpr_compliance) }}</td>
     </tr>
     <tr class="table-info">
         <td colspan="2"><b>Users</b></td>
diff --git a/translations/messages.cs.xlf b/translations/messages.cs.xlf
index 19b3e3f4..bde090df 100644
--- a/translations/messages.cs.xlf
+++ b/translations/messages.cs.xlf
@@ -11196,7 +11196,7 @@ Element 3</target>
     <unit id="9jOklgS" name="log.user_login.ip_anonymize_hint">
       <segment state="translated">
         <source>log.user_login.ip_anonymize_hint</source>
-        <target>Pokud poslední číslice IP adresy chybí, je povolen režim GPDR, ve kterém jsou IP adresy anynomizovány.</target>
+        <target>Pokud poslední číslice IP adresy chybí, je povolen režim GDPR, ve kterém jsou IP adresy anynomizovány.</target>
       </segment>
     </unit>
     <unit id="kaMyDVi" name="log.user_not_allowed.unauthorized_access_attempt_to">
diff --git a/translations/messages.da.xlf b/translations/messages.da.xlf
index bc6f7db5..d7258986 100644
--- a/translations/messages.da.xlf
+++ b/translations/messages.da.xlf
@@ -11201,7 +11201,7 @@ Oversættelsen
     <unit id="9jOklgS" name="log.user_login.ip_anonymize_hint">
       <segment state="translated">
         <source>log.user_login.ip_anonymize_hint</source>
-        <target>Hvis de sidste cifre i IP-adressen mangler, aktiveres DSGV-tilstanden, hvor IP-adresserne anonymiseres.</target>
+        <target>Hvis de sidste cifre i IP-adressen mangler, aktiveres databeskyttelsesforordningen mode, hvor IP-adresserne anonymiseres.</target>
       </segment>
     </unit>
     <unit id="kaMyDVi" name="log.user_not_allowed.unauthorized_access_attempt_to">
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index a9e9f313..0386e0b1 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -11192,7 +11192,7 @@ Element 3</target>
     <unit id="sg8NMZk" name="log.user_login.ip_anonymize_hint">
       <segment state="translated">
         <source>log.user_login.ip_anonymize_hint</source>
-        <target>Wenn die letzten Stellen der IP-Adresse fehlen, dann ist der DSGV Modus aktiviert, bei dem IP-Adressen anonymisiert werden.</target>
+        <target>Wenn die letzten Stellen der IP-Adresse fehlen, dann ist der DSGVO Modus aktiviert, bei dem IP-Adressen anonymisiert werden.</target>
       </segment>
     </unit>
     <unit id="K_LOvwj" name="log.user_not_allowed.unauthorized_access_attempt_to">
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 82c3003b..de8531aa 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -11196,7 +11196,7 @@ Element 3</target>
     <unit id="sg8NMZk" name="log.user_login.ip_anonymize_hint">
       <segment state="translated">
         <source>log.user_login.ip_anonymize_hint</source>
-        <target>If the last digits of the IP address are missing, then the GPDR mode is enabled, in which IP addresses are anynomized.</target>
+        <target>If the last digits of the IP address are missing, then the GDPR mode is enabled, in which IP addresses are anynomized.</target>
       </segment>
     </unit>
     <unit id="K_LOvwj" name="log.user_not_allowed.unauthorized_access_attempt_to">
diff --git a/translations/messages.pl.xlf b/translations/messages.pl.xlf
index d20d1b9e..5b038410 100644
--- a/translations/messages.pl.xlf
+++ b/translations/messages.pl.xlf
@@ -11192,7 +11192,7 @@ Element 3</target>
     <unit id="sg8NMZk" name="log.user_login.ip_anonymize_hint">
       <segment state="translated">
         <source>log.user_login.ip_anonymize_hint</source>
-        <target>Jeśli brakuje ostatnich cyfr adresu IP, włączony jest tryb GPDR, w którym adresy IP są anonimowe.</target>
+        <target>Jeśli brakuje ostatnich cyfr adresu IP, włączony jest tryb GDPR, w którym adresy IP są anonimowe.</target>
       </segment>
     </unit>
     <unit id="K_LOvwj" name="log.user_not_allowed.unauthorized_access_attempt_to">