diff --git a/src/main/resources/org/traccar/web/client/i18n/Messages_de.properties b/src/main/resources/org/traccar/web/client/i18n/Messages_de.properties
index 4f5be4f6..8c41a110 100644
--- a/src/main/resources/org/traccar/web/client/i18n/Messages_de.properties
+++ b/src/main/resources/org/traccar/web/client/i18n/Messages_de.properties
@@ -18,11 +18,18 @@ errInvalidUsernameOrPassword = Username oder Passwort ist falsch
 globalSettings = Globale Einstellungen
 registration = Registration
 updateInterval = Update Intervall
+disallowDeviceManagementByUsers = Verbiete Usern die Geräte Verwaltung
+eventRecordingEnabled = Ereignisse aufzeichnen
+defaultHashImplementation = Standard Passwort Verschlüsselung
 # archive view
 archive = Archiv
 from = vom
 to = bis
 load = Laden
+exportToCSV = Exportiere CSV
+exportToGPX = Exportiere GPX
+importData = Import
+exportData = Exportiere
 clear = Löschen
 errNoResults = Es gibt keine Daten für diese Zeit
 errFillFields = Alle Formular Felder müssen ausgefüllt werden!
@@ -38,6 +45,7 @@ power = Energie
 # device dialog
 uniqueIdentifier = Geräte ID / IMEI
 # device view
+objects = Objekte
 devices = Geräte
 add = Neu
 edit = Ändern
@@ -48,6 +56,7 @@ account = Account
 preferences = Einstellungen
 users = User
 global = Global
+notifications = Benachrichtigung
 trackerServerLog = Tracker Server Log
 logout = Logout
 follow = Folgen
@@ -86,6 +95,7 @@ ago = vor {0}
 meter = m
 idle = im Leerlauf
 since = seit {0}
+protocol = Protokoll
 changePassword = Passwort ändern
 enterNewPassword = Geben Sie das neue Passwort ein für {0}
 log = Log
@@ -115,4 +125,20 @@ smallPalette = Kleine Palette
 markers = Marker
 standardMarkers = Standard Marker
 reducedMarkers = Reduzierte Marker
-zoomToTrack = Zoom zum Track
\ No newline at end of file
+zoomToTrack = Zoom zum Track
+# Geo-Fences window
+geoFence = Geo-Fence
+description = Beschreibung
+type = Typ
+width = Größe
+radius = Radius
+color = Farbe
+errGeoFenceIsEmpty = Please draw a geo-fence
+confirmGeoFenceRemoval = Are you sure you want remove geo-fence?
+newGeoFence = Neuer Meldebereich
+geoFenceType = Unknown type
+geoFenceType[LINE] = Linie
+geoFenceType[CIRCLE] = Kreis
+geoFenceType[POLYGON] = Polygon
+errSaveChanges = Please save changes
+applyToAllDevices = Auf alle Geräte anwenden
\ No newline at end of file
diff --git a/src/main/webapp/m/js/i18n/Messages.js b/src/main/webapp/m/js/i18n/Messages.js
index 3c2c419e..c85d2cf0 100644
--- a/src/main/webapp/m/js/i18n/Messages.js
+++ b/src/main/webapp/m/js/i18n/Messages.js
@@ -29,27 +29,27 @@ var i18n = {
     de: {
         _name_: 'German',
         // login screen
-        language: 'Language',
-        username: 'User',
+        language: 'Sparache',
+        username: 'Username',
         password: 'Passwort',
-        your_username: 'Your username',
-        your_password: 'Your password',
-        sign_in: 'Login',
+        your_username: 'Ihr Username',
+        your_password: 'Ihr Passwort',
+        sign_in: 'Einloggen',
         user_name_and_password_must_not_be_empty: 'Username und Passwort dürfen nicht leer sein!',
         user_name_or_password_is_invalid: 'Username oder Passwort ist falsch',
         unexpected_error: 'Unexpected error',
-        open_desktop_version: 'Open Desktop version',
+        open_desktop_version: 'Zur Desktop Version',
         // sidebar
         devices: 'Geräte',
         logout: 'Logout',
         // device details
-        select_on_map: 'Select on map',
+        select_on_map: 'Auf Karte zeigen',
         no_data_available: 'No data available',
         time: 'Zeit',
         latitude: 'Breite',
         longitude: 'Länge',
         altitude: 'Höhe',
-        speed: 'Geschwindigkeit',
+        speed: 'Geschw.',
         course: 'Richtung',
         address: 'Adresse'
     },