From 5d077c329ad937e9749cffbba5f6090954ff7fe7 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Fri, 10 Nov 2017 01:16:01 +0100
Subject: [PATCH] fix the fix with the fix from the fix that fixes the fix.

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dd7410f36b..0124a850ad 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -687,7 +687,7 @@
     <string name="combo_pump_state_disconnected">Keine Verbindung zur Pumpe</string>
     <string name="combo_pump_state_suspended_by_user">Durch Benuzter gestoppt</string>
     <string name="combo_pump_state_suspended_due_to_error">Wegen Fehler gestoppt</string>
-    <string name="combo_pump_state_normal">Normaler Betrieb</string>
+    <string name="combo_pump_state_running">Normaler Betrieb</string>
     <string name="combo_stats">Statistiken</string>
     <string name="combo_programming_bolus">Bolusabgabe wird vorbereitet</string>
     <string name="combo_pump_action_cancelling_tbr">TBR wird abgebrochen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3c7943453..7026f2da63 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -776,7 +776,7 @@
     <string name="combo_pump_state_disconnected">Pump disconnected</string>
     <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
     <string name="combo_pump_state_suspended_by_user">Suspended by user</string>
-    <string name="combo_pump_state_normal">Normal</string>
+    <string name="combo_pump_state_running">Running</string>
     <string name="combo_pump_action_checking_history">Checking pump history</string>
     <string name="combo_pump_action_cancelling_tbr">Cancelling TBR</string>
     <string name="combo_pump_action_setting_tbr">Setting TBR</string>
@@ -802,6 +802,7 @@
     <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last minute. For safety reasons this is disallowed.</string>
     <string name="combo_pump_state_initializing">Initializing</string>
     <string name="combo_pump_connected_now">Now</string>
+    <string name="combo_activity_reading_pump_history">Reading pump history</string>
     <string name="pump_history">pump history</string>
 </resources>