From 11d26b9815486377c74a7c3fbd013d024259a9e3 Mon Sep 17 00:00:00 2001
From: viktoria <leonieneon@gmail.com>
Date: Mon, 18 Jul 2016 23:32:12 +0200
Subject: [PATCH 1/2] typo

---
 .../nightscout/utils/{JsonFormatter.java => JSONFormatter.java}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/java/info/nightscout/utils/{JsonFormatter.java => JSONFormatter.java} (100%)

diff --git a/app/src/main/java/info/nightscout/utils/JsonFormatter.java b/app/src/main/java/info/nightscout/utils/JSONFormatter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/utils/JsonFormatter.java
rename to app/src/main/java/info/nightscout/utils/JSONFormatter.java

From 5afe78cf2a0ff0848410d6080db417fff1e70cf9 Mon Sep 17 00:00:00 2001
From: viktoria <leonieneon@gmail.com>
Date: Mon, 18 Jul 2016 23:49:25 +0200
Subject: [PATCH 2/2] German Translation #6

---
 app/src/main/res/values-de/strings.xml | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 29a99fb16f..ad010f1a61 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -204,4 +204,33 @@
     <string name="bg_lang">Bulgarian</string>
     <string name="nightscout">Nightscout</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
+    <string name="absolute">Absolut</string>
+    <string name="bolusfailed">Bolus fehlgeschlagen</string>
+    <string name="canceltemp">Temp Basal abbrechen</string>
+    <string name="careportal_temporarytarget">Temoräres Ziel</string>
+    <string name="careportal_temporarytargetcancel">Temoräres Ziel abbrechen</string>
+    <string name="comment">Kommentar</string>
+    <string name="connected">Verbunden</string>
+    <string name="connecting">Verbinden</string>
+    <string name="connectionerror">Puempen Verbindungsfehler</string>
+    <string name="danar_bt_name_title">DanaR Blueetooth Gerät</string>
+    <string name="danar_iob_label">Pumpen IOB:</string>
+    <string name="danar_pump_settings">DanaR Pumpen Einstellungen</string>
+    <string name="danarpump">DanaR</string>
+    <string name="disconnected">Getrennt</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="glucosetype_finger">Finger</string>
+    <string name="language">Sprache</string>
+    <string name="mm640g">MM 640g</string>
+    <string name="percent">Prozent</string>
+    <string name="reloadprofile">Profil neuladen</string>
+    <string name="save">Speichern</string>
+    <string name="success">Erfolgreich</string>
+    <string name="virtualpump_lastconnection_label">Letzte Verbindung:</string>
+    <string name="danar_lastbolus">Letzter Bolus:</string>
+    <string name="danar_viewprofile">Profil anzeigen</string>
+    <string name="danarprofile">DanaR Profil Einstellungen</string>
+    <string name="danarprofile_dia">DIA [h]</string>
+    <string name="danarprofile_car">Carbs absorption rate</string>
+    <string name="glucosetype_manual">Manuell</string>
 </resources>