From 309ee1b9a61949e82b3071811e3538663f42cf5c Mon Sep 17 00:00:00 2001
From: Mathias Dalheimer <md@gonium.net>
Date: Tue, 20 Mar 2018 15:37:47 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Fixed=20typo:=20Temor=C3=A4r=20->=20Tempor?=
 =?UTF-8?q?=C3=A4r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 265c6c63ac..ab9cf8ea11 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -189,8 +189,8 @@
     <string name="absolute">Absolut</string>
     <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
     <string name="canceltemp">TBR abbrechen</string>
-    <string name="careportal_temporarytarget">Temoräres Ziel</string>
-    <string name="careportal_temporarytargetcancel">Temoräres Ziel abbrechen</string>
+    <string name="careportal_temporarytarget">Temporäres Ziel</string>
+    <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
     <string name="comment">Kommentar</string>
     <string name="connected">Verbunden</string>
     <string name="connecting">Verbinden</string>

From a14d698530db1928c4d44dea1a4be7e91b0c8809 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Tue, 20 Mar 2018 15:56:13 +0100
Subject: [PATCH 2/3] small correction to trigger travis again

---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ab9cf8ea11..1fba384a05 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -686,7 +686,7 @@
     <string name="shortgramm">g</string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
-    <string name="shortprotein">Pr</string>
+    <string name="shortprotein">Ew</string>
     <string name="shortfat">Fat</string>
     <string name="urgent_alarm">Wichtiger Alarm</string>
     <string name="info">INFO</string>

From 60247daca2583d4e5139d024b3943ef863943801 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Tue, 20 Mar 2018 16:19:51 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"Fixed=20typo:=20Temor=C3=A4r=20->?=
 =?UTF-8?q?=20Tempor=C3=A4r"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1fba384a05..265c6c63ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -189,8 +189,8 @@
     <string name="absolute">Absolut</string>
     <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
     <string name="canceltemp">TBR abbrechen</string>
-    <string name="careportal_temporarytarget">Temporäres Ziel</string>
-    <string name="careportal_temporarytargetcancel">Temporäres Ziel 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>
@@ -686,7 +686,7 @@
     <string name="shortgramm">g</string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
-    <string name="shortprotein">Ew</string>
+    <string name="shortprotein">Pr</string>
     <string name="shortfat">Fat</string>
     <string name="urgent_alarm">Wichtiger Alarm</string>
     <string name="info">INFO</string>