diff --git a/lib/language.js b/lib/language.js
index 87fb871e1d1..d9a023e5d72 100644
--- a/lib/language.js
+++ b/lib/language.js
@@ -894,7 +894,7 @@ function init() {
       }
     ,'Notes contain' : {
       cs: 'Poznámky obsahují'
-      ,de: 'Erläuterungen'
+      ,de: 'Notizen enthalten'
       ,he: 'ההערות מכילות'
       ,es: 'Contenido de las notas'
       ,fr: 'Notes contiennent'
@@ -994,7 +994,7 @@ function init() {
       }
     ,'Display' : {
       cs: 'Zobraz'
-      ,de: 'Darstellen'
+      ,de: 'Anzeigen'
       ,es: 'Visualizar'
       ,fr: 'Afficher'
       ,el: 'Εμφάνιση'
@@ -1219,7 +1219,7 @@ function init() {
       }
     ,'Portion' : {
       cs: 'Porce'
-      ,de: 'Portion'
+      ,de: 'Abschnitt'
       ,es: 'Porción'
       ,fr: 'Portion'
       ,el: 'Μερίδα'
@@ -1396,7 +1396,7 @@ function init() {
       }
     ,'Week to week' : {
       cs: 'Week to week'
-      ,de: 'Week to week'
+      ,de: 'Woche zu Woche'
       ,es: 'Week to week'
       ,fr: 'Week to week'
       ,el: 'Week to week'
@@ -1642,7 +1642,7 @@ function init() {
       }
     ,'Period' : {
       cs: 'Období'
-      ,de: 'Periode'
+      ,de: 'Zeitabschnitt'
       ,es: 'Periodo'
       ,fr: 'Période'
       ,el: 'Περίοδος'
@@ -2017,7 +2017,7 @@ function init() {
       }
     ,'Total per day' : {
       cs: 'dní celkem'
-      ,de: 'Gesamttage'
+      ,de: 'Gesamt pro Tag'
       ,es: 'Total de días'
       ,fr: 'Total journalier'
       ,el: 'ημέρες συνολικά'
@@ -3455,7 +3455,7 @@ function init() {
       }
     ,'Add from database' : {
       cs: 'Přidat z databáze'
-      ,de: 'Ergänzt aus Datenbank'
+      ,de: 'Ergänze aus Datenbank'
       ,es: 'Añadir desde la base de datos'
       ,fr: 'Ajouter à partir de la base de données'
       ,el: 'Επιλογή από τη Βάση Δεδομένων'
@@ -3731,7 +3731,7 @@ function init() {
     ,'60 minutes earlier' : {
       cs: '60 min předem'
       ,he: 'שישים דקות מוקדם יותר'
-      ,de: '60 Min. früher'
+      ,de: '60 Minuten früher'
       ,es: '60 min antes'
       ,fr: '60 min plus tôt'
       ,el: '60 λεπτά πριν'
@@ -3756,7 +3756,7 @@ function init() {
     ,'45 minutes earlier' : {
       cs: '45 min předem'
       ,he: 'ארבעים דקות מוקדם יותר'
-      ,de: '45 Min. früher'
+      ,de: '45 Minuten früher'
       ,es: '45 min antes'
       ,fr: '45 min plus tôt'
       ,el: '45 λεπτά πριν'
@@ -3781,7 +3781,7 @@ function init() {
     ,'30 minutes earlier' : {
       cs: '30 min předem'
       ,he: 'שלושים דקות מוקדם יותר'
-      ,de: '30 Min früher'
+      ,de: '30 Minuten früher'
       ,es: '30 min antes'
       ,fr: '30 min plus tôt'
       ,el: '30 λεπτά πριν'
@@ -3806,7 +3806,7 @@ function init() {
     ,'20 minutes earlier' : {
       cs: '20 min předem'
       ,he: 'עשרים דקות מוקדם יותר'
-      ,de: '20 Min. früher'
+      ,de: '20 Minuten früher'
       ,es: '20 min antes'
       ,fr: '20 min plus tôt'
       ,el: '20 λεπτά πριν'
@@ -3831,7 +3831,7 @@ function init() {
     ,'15 minutes earlier' : {
       cs: '15 min předem'
       ,he: 'חמש עשרה דקות מוקדם יותר'
-      ,de: '15 Min. früher'
+      ,de: '15 Minuten früher'
       ,es: '15 min antes'
       ,fr: '15 min plus tôt'
       ,el: '15 λεπτά πριν'
@@ -3879,7 +3879,7 @@ function init() {
       }
     ,'15 minutes later' : {
       cs: '15 min po'
-      ,de: '15 Min. später'
+      ,de: '15 Minuten später'
       ,es: '15 min más tarde'
       ,fr: '15 min plus tard'
       ,el: '15 λεπτά αργότερα'
@@ -3904,7 +3904,7 @@ function init() {
       }
     ,'20 minutes later' : {
       cs: '20 min po'
-      ,de: '20 Min. später'
+      ,de: '20 Minuten später'
       ,es: '20 min más tarde'
       ,fr: '20 min plus tard'
       ,el: '20 λεπτά αργότερα'
@@ -3929,7 +3929,7 @@ function init() {
       }
     ,'30 minutes later' : {
       cs: '30 min po'
-      ,de: '30 Min. später'
+      ,de: '30 Minuten später'
       ,es: '30 min más tarde'
       ,fr: '30 min plus tard'
       ,el: '30 λεπτά αργότερα'
@@ -3954,7 +3954,7 @@ function init() {
       }
     ,'45 minutes later' : {
       cs: '45 min po'
-      ,de: '45 Min. später'
+      ,de: '45 Minuten später'
       ,es: '45 min más tarde'
       ,fr: '45 min plus tard'
       ,el: '45 λεπτά αργότερα'
@@ -3979,7 +3979,7 @@ function init() {
       }
     ,'60 minutes later' : {
       cs: '60 min po'
-      ,de: '60 Min. später'
+      ,de: '60 Minuten später'
       ,es: '60 min más tarde'
       ,fr: '60 min plus tard'
       ,el: '60 λεπτά αργότερα'
@@ -4030,7 +4030,7 @@ function init() {
     ,'RETRO MODE' : {
       cs: 'V MINULOSTI'
       ,he: 'מצב רטרו'
-      ,de: 'RETRO MODUS'
+      ,de: 'Retro Modus'
       ,es: 'Modo Retrospectivo'
       ,fr: 'MODE RETROSPECTIF'
       ,el: 'Αναδρομική Λειτουργία'
@@ -5056,7 +5056,7 @@ function init() {
       }
     ,'BG Check' : {
       cs: 'Kontrola glykémie'
-      ,de: 'BG-Prüfung'
+      ,de: 'BG Messung'
       ,es: 'Control de glucemia'
       ,fr: 'Contrôle glycémie'
       ,el: 'Έλεγχος Γλυκόζης'
@@ -5605,7 +5605,7 @@ function init() {
       }
     ,'View all treatments' : {
       cs: 'Zobraz všechny ošetření'
-      ,de: 'Zeige alle Eingaben'
+      ,de: 'Zeige alle Behandlungen'
       ,es: 'Visualizar todos los tratamientos'
       ,fr: 'Voir tous les traitements'
       ,el: 'Προβολή όλων των ενεργειών'
@@ -5878,7 +5878,7 @@ function init() {
     ,'mins' : {
       cs: 'min'
       ,he: 'דקות'
-      ,de: 'min'
+      ,de: 'Minuten'
       ,es: 'min'
       ,fr: 'mins'
       ,el: 'λεπτά'
@@ -6138,7 +6138,7 @@ function init() {
     ,'Theme' : {
       cs: 'Téma'
       ,he: 'נושא'
-      ,de: 'Thema'
+      ,de: 'Aussehen'
       ,es: 'Tema'
       ,fr: 'Thème'
       ,el: 'Θέμα απεικόνισης'
@@ -6579,7 +6579,7 @@ function init() {
     ,'Clean' : {
       cs: 'Čistý'
       ,he: 'נקה'
-      ,de: 'Rein'
+      ,de: 'Löschen'
       ,es: 'Limpio'
       ,fr: 'Propre'
       ,el: 'Καθαρισμός'
@@ -6682,7 +6682,7 @@ function init() {
       }
     ,'Treatment type' : {
       cs: 'Typ ošetření'
-      ,de: 'Eingabe-Typ'
+      ,de: 'Behandlungstyp'
       ,es: 'Tipo de tratamiento'
       ,fr: 'Type de traitement'
       ,el: 'Τύπος Ενέργειας'
@@ -9136,7 +9136,7 @@ function init() {
       ,nb: 'IKH'
       ,fr: 'I:C'
       ,ro: 'ICR'
-      ,de: 'I:KH'
+      ,de: 'IE:KH'
       ,dk: 'I:C'
       ,es: 'I:C'
       ,sv: 'I:C'
@@ -9836,7 +9836,7 @@ function init() {
       ,fr: 'Repas sous peu'
       ,sv: 'Snart matdags'
       ,nb: 'Snart tid for mat'
-      ,de: 'Bald essend'
+      ,de: 'Bald essen'
       ,dk: 'Spiser snart'
       ,es: 'Comer pronto'
       ,bg: 'Ядене скоро'
@@ -10241,7 +10241,7 @@ function init() {
       ,sv: 'Är du säker att du vill ta bort:'
       ,nb: 'Er du sikker på at du vil slette:'
       ,fi: 'Oletko varmat että haluat tuhota: '
-      ,de: ' Sind sie sicher, das Sie löschen wollen:'
+      ,de: 'Sind sie sicher, das Sie löschen wollen:'
       ,dk: 'Er du sikker på at du vil slette:'
       ,es: 'Seguro que quieres eliminarlo:'
       ,pt: 'Tem certeza de que deseja apagar:'
@@ -10724,7 +10724,7 @@ function init() {
       ,sv: 'Tyst i %1 minuter'
       ,nb: 'Stille i %1 minutter'
       ,fi: 'Hiljennä %1 minuutiksi'
-      ,de: 'Inaktivität für %1 Minuten'
+      ,de: 'Ruhe für 1 Minuten'
       ,dk: 'Stilhed i %1 minutter'
       ,pt: 'Silencir por %1 minutos'
       ,es: 'Silenciado por %1 minutos'
@@ -13202,7 +13202,7 @@ function init() {
     'virtAsstUnknown': {
       bg:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
       , cs:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
-      , de:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
+      , de:  'Dieser Wert ist momentan unbekannt. Prüfe deine Nightscout Webseite für Details!'
       , dk:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
       , el:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
       , en:  'That value is unknown at the moment. Please see your Nightscout site for more details.'
@@ -13228,7 +13228,7 @@ function init() {
     'virtAsstTitleAR2Forecast': {
       bg:  'AR2 Forecast'
       , cs:  'AR2 Forecast'
-      , de:  'AR2 Forecast'
+      , de:  'AR2 Vorhersage'
       , dk:  'AR2 Forecast'
       , el:  'AR2 Forecast'
       , en:  'AR2 Forecast'
@@ -13254,7 +13254,7 @@ function init() {
     'virtAsstTitleCurrentBasal': {
       bg:  'Current Basal'
       , cs:  'Current Basal'
-      , de:  'Current Basal'
+      , de:  'Aktuelles Basalinsulin'
       , dk:  'Current Basal'
       , el:  'Current Basal'
       , en:  'Current Basal'
@@ -13280,7 +13280,7 @@ function init() {
     'virtAsstTitleCurrentCOB': {
       bg:  'Current COB'
       , cs:  'Current COB'
-      , de:  'Current COB'
+      , de:  'Aktuelle Kohlenhydrate'
       , dk:  'Current COB'
       , el:  'Current COB'
       , en:  'Current COB'
@@ -13306,7 +13306,7 @@ function init() {
     'virtAsstTitleCurrentIOB': {
       bg:  'Current IOB'
       , cs:  'Current IOB'
-      , de:  'Current IOB'
+      , de:  'Aktuelles Restinsulin'
       , dk:  'Current IOB'
       , el:  'Current IOB'
       , en:  'Current IOB'
@@ -13332,7 +13332,7 @@ function init() {
     'virtAsstTitleLoopForecast': {
       bg:  'Loop Forecast'
       , cs:  'Loop Forecast'
-      , de:  'Loop Forecast'
+      , de:  'Loop Vorhersage'
       , dk:  'Loop Forecast'
       , el:  'Loop Forecast'
       , en:  'Loop Forecast'
@@ -13358,7 +13358,7 @@ function init() {
     'virtAsstTitleLastLoop': {
       bg:  'Last Loop'
       , cs:  'Last Loop'
-      , de:  'Last Loop'
+      , de:  'Letzter Loop'
       , dk:  'Last Loop'
       , el:  'Last Loop'
       , en:  'Last Loop'
@@ -13384,7 +13384,7 @@ function init() {
     'virtAsstTitleOpenAPSForecast': {
       bg:  'OpenAPS Forecast'
       , cs:  'OpenAPS Forecast'
-      , de:  'OpenAPS Forecast'
+      , de:  'OpenAPS Vorhersage'
       , dk:  'OpenAPS Forecast'
       , el:  'OpenAPS Forecast'
       , en:  'OpenAPS Forecast'
@@ -13410,7 +13410,7 @@ function init() {
     'virtAsstTitlePumpReservoir': {
       bg:  'Insulin Remaining'
       , cs:  'Insulin Remaining'
-      , de:  'Insulin Remaining'
+      , de:  'Verbleibendes Insulin'
       , dk:  'Insulin Remaining'
       , el:  'Insulin Remaining'
       , en:  'Insulin Remaining'
@@ -13436,7 +13436,7 @@ function init() {
     'virtAsstTitlePumpBattery': {
       bg:  'Pump Battery'
       , cs:  'Pump Battery'
-      , de:  'Pump Battery'
+      , de:  'Pumpenbatterie'
       , dk:  'Pump Battery'
       , el:  'Pump Battery'
       , en:  'Pump Battery'
@@ -13462,7 +13462,7 @@ function init() {
     'virtAsstTitleRawBG': {
       bg:  'Current Raw BG'
       , cs:  'Current Raw BG'
-      , de:  'Current Raw BG'
+      , de:  'Aktueller Blutzucker Rohwert'
       , dk:  'Current Raw BG'
       , el:  'Current Raw BG'
       , en:  'Current Raw BG'
@@ -13488,7 +13488,7 @@ function init() {
     'virtAsstTitleUploaderBattery': {
       bg:  'Uploader Battery'
       , cs:  'Uploader Battery'
-      , de:  'Uploader Battery'
+      , de:  'Uploader Batterie'
       , dk:  'Uploader Battery'
       , el:  'Uploader Battery'
       , en:  'Uploader Battery'
@@ -13514,7 +13514,7 @@ function init() {
     'virtAsstTitleCurrentBG': {
       bg:  'Current BG'
       , cs:  'Current BG'
-      , de:  'Current BG'
+      , de:  'Aktueller Blutzucker'
       , dk:  'Current BG'
       , el:  'Current BG'
       , en:  'Current BG'
@@ -13540,7 +13540,7 @@ function init() {
     'virtAsstTitleFullStatus': {
       bg:  'Full Status'
       , cs:  'Full Status'
-      , de:  'Full Status'
+      , de:  'Gesamtstatus'
       , dk:  'Full Status'
       , el:  'Full Status'
       , en:  'Full Status'
@@ -13853,7 +13853,7 @@ function init() {
       , cs: 'Your uploader battery is at %1'
       , en: 'Your uploader battery is at %1'
       , hr: 'Your uploader battery is at %1'
-      , de: 'Your uploader battery is at %1'
+      , de: 'Der Akku deines Uploader Handys ist bei %1'
       , dk: 'Your uploader battery is at %1'
       , ko: 'Your uploader battery is at %1'
       , nl: 'Your uploader battery is at %1'
@@ -13904,7 +13904,7 @@ function init() {
       , cs: 'Podle přepovědi smyčky je očekávána glykémie around %1 během následujících %2'
       , en: 'According to the loop forecast you are expected to be around %1 over the next %2'
       , hr: 'According to the loop forecast you are expected to be around %1 over the next %2'
-      , de: 'Entsprechend der Loop Vorhersage landest du bei around %1 während der nächsten %2'
+      , de: 'Entsprechend der Loop Vorhersage landest in den nächsten %2 bei %1'
       , dk: 'Ifølge Loops forudsigelse forventes du at blive around %1 i den næste %2'
       , ko: 'According to the loop forecast you are expected to be around %1 over the next %2'
       , nl: 'Volgens de Loop voorspelling is je waarde around %1 over de volgnede %2'
@@ -13921,7 +13921,7 @@ function init() {
       , cs: 'Podle přepovědi smyčky je očekávána glykémie between %1 and %2 během následujících %3'
       , en: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
       , hr: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
-      , de: 'Entsprechend der Loop Vorhersage landest du bei between %1 and %2 während der nächsten %3'
+      , de: 'Entsprechend der Loop Vorhersage landest du zwischen %1 and %2 während der nächsten %3'
       , dk: 'Ifølge Loops forudsigelse forventes du at blive between %1 and %2 i den næste %3'
       , ko: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
       , nl: 'Volgens de Loop voorspelling is je waarde between %1 and %2 over de volgnede %3'
@@ -13938,7 +13938,7 @@ function init() {
       , cs: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
       , en: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
       , hr: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
-      , de: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
+      , de: 'Entsprechend der AR2 Vorhersage landest du in %2 bei %1'
       , dk: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
       , ko: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
       , nl: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
@@ -13955,7 +13955,7 @@ function init() {
       , cs: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
       , en: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
       , hr: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
-      , de: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
+      , de: 'Entsprechend der AR2 Vorhersage landest du in %3 zwischen %1 and %2'
       , dk: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
       , ko: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
       , nl: 'According to the AR2 forecast you are expected to be between %1 and %2 over the next %3'
@@ -14019,35 +14019,35 @@ function init() {
       , tr: 'OpenAPS tarafından tahmin edilen kan şekeri %1'
     },
     'virtAsstCob3person': {
-        bg: '%1 has $2 carbohydrates on board'
-        , cs: '%1 has $2 carbohydrates on board'
-        , de: '%1 has $2 carbohydrates on board'
-        , dk: '%1 has $2 carbohydrates on board'
-        , el: '%1 has $2 carbohydrates on board'
-        , en: '%1 has $2 carbohydrates on board'
-        , es: '%1 has $2 carbohydrates on board'
-        , fi: '%1 has $2 carbohydrates on board'
-        , fr: '%1 has $2 carbohydrates on board'
-        , he: '%1 has $2 carbohydrates on board'
-        , hr: '%1 has $2 carbohydrates on board'
-        , it: '%1 has $2 carbohydrates on board'
-        , ko: '%1 has $2 carbohydrates on board'
-        , nb: '%1 has $2 carbohydrates on board'
-        , nl: '%1 has $2 carbohydrates on board'
-        , pl: '%1 has $2 carbohydrates on board'
-        , pt: '%1 has $2 carbohydrates on board'
-        , ro: '%1 has $2 carbohydrates on board'
-        , ru: '%1 has $2 carbohydrates on board'
-        , sk: '%1 has $2 carbohydrates on board'
-        , sv: '%1 has $2 carbohydrates on board'
-        , tr: '%1 has $2 carbohydrates on board'
-        , zh_cn: '%1 has $2 carbohydrates on board'
-        , zh_tw: '%1 has $2 carbohydrates on board'
+        bg: '%1 has %2 carbohydrates on board'
+        , cs: '%1 has %2 carbohydrates on board'
+        , de: '%1 hat %2 Kohlenhydrate wirkend'
+        , dk: '%1 has %2 carbohydrates on board'
+        , el: '%1 has %2 carbohydrates on board'
+        , en: '%1 has %2 carbohydrates on board'
+        , es: '%1 has %2 carbohydrates on board'
+        , fi: '%1 has %2 carbohydrates on board'
+        , fr: '%1 has %2 carbohydrates on board'
+        , he: '%1 has %2 carbohydrates on board'
+        , hr: '%1 has %2 carbohydrates on board'
+        , it: '%1 has %2 carbohydrates on board'
+        , ko: '%1 has %2 carbohydrates on board'
+        , nb: '%1 has %2 carbohydrates on board'
+        , nl: '%1 has %2 carbohydrates on board'
+        , pl: '%1 has %2 carbohydrates on board'
+        , pt: '%1 has %2 carbohydrates on board'
+        , ro: '%1 has %2 carbohydrates on board'
+        , ru: '%1 has %2 carbohydrates on board'
+        , sk: '%1 has %2 carbohydrates on board'
+        , sv: '%1 has %2 carbohydrates on board'
+        , tr: '%1 has %2 carbohydrates on board'
+        , zh_cn: '%1 has %2 carbohydrates on board'
+        , zh_tw: '%1 has %2 carbohydrates on board'
     },
     'virtAsstCob': {
         bg: 'You have %1 carbohydrates on board'
         , cs: 'You have %1 carbohydrates on board'
-        , de: 'You have %1 carbohydrates on board'
+        , de: 'Du hast noch %1 Kohlenhydrate wirkend.'
         , dk: 'You have %1 carbohydrates on board'
         , el: 'You have %1 carbohydrates on board'
         , en: 'You have %1 carbohydrates on board'
@@ -14073,7 +14073,7 @@ function init() {
     'virtAsstUnknownIntentTitle': {
       en: 'Unknown Intent'
       , cs: 'Unknown Intent'
-      , de: 'Unknown Intent'
+      , de: 'Unbekannter Satz'
       , dk: 'Unknown Intent'
       , ko: 'Unknown Intent'
       , nl: 'Unknown Intent'
@@ -14090,7 +14090,7 @@ function init() {
     'virtAsstUnknownIntentText': {
       en: 'I\'m sorry, I don\'t know what you\'re asking for.'
       , cs: 'I\'m sorry, I don\'t know what you\'re asking for.'
-      , de: 'I\'m sorry, I don\'t know what you\'re asking for.'
+      , de: 'Tut mir leid, ich hab deine Frage nicht verstanden.'
       , dk: 'I\'m sorry, I don\'t know what you\'re asking for.'
       , ko: 'I\'m sorry, I don\'t know what you\'re asking for.'
       , nl: 'I\'m sorry, I don\'t know what you\'re asking for.'