From fa1a08367f9bdaac215f7208b51ef44e1ccd6471 Mon Sep 17 00:00:00 2001
From: Andy Rozman <aleksander.rozman@bearingpoint.com>
Date: Thu, 9 Aug 2018 15:11:34 +0100
Subject: [PATCH] - Changed one string - Removed one pump that was just wrongly
 named (553 doesn't exists, 523 is actually Revel one)

---
 .../plugins/PumpCommon/defs/PumpType.java           | 13 ++++++-------
 app/src/main/res/values/arrays.xml                  |  3 +--
 app/src/main/res/values/strings.xml                 |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
index f22c07fa8a..ace874485c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
@@ -89,25 +89,24 @@ public enum PumpType {
             0.05f, 0.05f, null, PumpCapability.VirtualPumpCapabilities),
 
     // Medtronic
-    Minimed_512_712("Medtronic 512/712", 0.05f, null, //
+    Medtronic_512_712("Medtronic 512/712", 0.05f, null, //
             new DoseSettings(0.05f, 30, 8*60, 0.05f), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05f, 30, 24*60, 0f, 35f), PumpCapability.BasalRate_Duration30minAllowed, //
             0.05f, 0.05f, null, PumpCapability.VirtualPumpCapabilities), // TODO
 
-    Minimed_515_715("Medtronic 515/715", Minimed_512_712),
-    Minimed_522_722("Medtronic 522/722", Minimed_512_712),
-    Minimed_523_723("Medtronic 523/723", Minimed_512_712),
+    Medtronic_515_715("Medtronic 515/715", Medtronic_512_712),
+    Medtronic_522_722("Medtronic 522/722", Medtronic_512_712),
 
-    Minimed_553_753_Revel("Medtronic 553/753 (Revel)", 0.05f, null, //
+    Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", 0.05f, null, //
             new DoseSettings(0.05f, 30, 8*60, 0.05f), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05f, 30, 24*60, 0f, 35f), PumpCapability.BasalRate_Duration30minAllowed, //
             0.025f, 0.025f, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities), //
 
-    Minimed_554_754_Veo("Medtronic 554/754 (Veo)", Minimed_553_753_Revel), // TODO
+    Medtronic_554_754_Veo("Medtronic 554/754 (Veo)", Medtronic_523_723_Revel), // TODO
 
-    Minimed_640G("Medtronic 640G", 0.025f, null, //
+    Medtronic_640G("Medtronic 640G", 0.025f, null, //
             new DoseSettings(0.05f, 30, 8*60, 0.05f), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05f, 30, 24*60, 0f, 35f), PumpCapability.BasalRate_Duration30minAllowed, //
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 571f5f04a2..03cf25236e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -126,8 +126,7 @@
         <item>Medtronic 512/712</item>
         <item>Medtronic 515/715</item>
         <item>Medtronic 522/722</item>
-        <item>Medtronic 523/723</item>
-        <item>Medtronic 553/753 (Revel)</item>
+        <item>Medtronic 523/723 (Revel)</item>
         <item>Medtronic 554/754 (Veo)</item>
         <item>Medtronic 640G</item>
         <item>Tandem t:slim</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b26344179f..959a0a2974 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1087,7 +1087,7 @@
     <string name="value_unavailable_short">n/a</string>
     <string name="virtualpump_type">Virtual Pump Type</string>
     <string name="virtualpump_definition">Pump Definition</string>
-    <string name="virtualpump_pump_def" formated="false">Bolus: Step=%s\nExtended Bolus: [Step=%s, Duration=%smin-%sh]\nBasal: Step=%s\nTBR: %s (by %s), Duration=%smin-%sh\nEXTENDED_NOTE</string>
+    <string name="virtualpump_pump_def">Bolus: Step=%s\nExtended Bolus: [Step=%s, Duration=%smin-%sh]\nBasal: Step=%s\nTBR: %s (by %s), Duration=%smin-%sh\nEXTENDED_NOTE</string>
     <string name="virtualpump_pump_def_extended_note">* Ranged basal/bolus values are not supported by Virtual Pump.</string>
     <string name="ns_autobackfill_title">Autobackfill BG</string>
     <string name="ga_lang" translatable="false">Irish</string>